Skip to content

Instantly share code, notes, and snippets.

@duythinht
Created May 6, 2014 09:50
Show Gist options
  • Save duythinht/a5ad4bc80b8854c34888 to your computer and use it in GitHub Desktop.
Save duythinht/a5ad4bc80b8854c34888 to your computer and use it in GitHub Desktop.
[ui]
username=duythinht <[email protected]>
[auth]
bb.prefix = hg.saritasa.com:6060
bb.username = ThinhTran
bb.password = s=k$-[_K:
bb.schemes = http https
[hostfingerprints]
hg.saritasa.com = 46:3f:13:d2:72:27:0d:3e:cb:6f:2c:a1:be:5b:dd:41:3a:57:f6:5d
[ui]
merge = p4merge
[extensions]
hgext.extdiff =
[extdiff]
cmd.p4diff = p4merge
[tortoisehg]
vdiff = p4diff
[merge-tools]
p4merge.priority = 100
p4merge.premerge = True
p4merge.gui = True
p4merge.args = $base $local $other $output
p4merge.diffargs = $parent $child
p4merge.diff3args = $child $parent1 $parent2
p4merge.dirdiff = False
p4merge.checkchanged = True
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment