Faith Club

My mercurial .hgrc
24.12.16 10:37
[ui]
username = user name <user.name@example.org>
verbose = True
merge = bcomp

[alias]
bpush = push --rev .
bout = out --rev .

[extensions]
# pager =
progress =
color =
rebase =
histedit =
mq =
transplant =
graphlog =
patience = /home/w/_hg/hg-patience/patience.py

[merge-patterns]
.hgtags = internal:tagmerge
** = bcomp

[diff]
git = True
patience = 1

[mq]
secret = True

[merge-tools]
bcomp.args=$local $other $base -mergeoutput=$output -ro -lefttitle=parent1 -centertitle=base -righttitle=parent2 -outputtitle=merged -automerge -reviewconflicts -solo
bcomp.premerge=True
bcomp.binary=True
bcomp.gui=True
bcomp.priority=1
bcomp.diffargs=-lro -lefttitle='$plabel1' -righttitle='$clabel' -solo -expandall $parent $child
bcomp.diff3args=$parent1 $parent2 $child -lefttitle='$plabel1' -centertitle='$clabel' -righttitle='$plabel2' -solo -expandall
bcomp.dirdiff=True
bcomp.dir3diff=True
Tags: java