Advertisement
Not a member of Pastebin yet?
Sign Up,
it unlocks many cool features!
- [ui]
- username = Lee Wei <leewei@lshift.net>
- verbose = True
- merge = kdiff3
- [extensions]
- hgext.extdiff =
- color =
- mq =
- pager =
- [extdiff]
- cmd.kdiff3 = /usr/bin/kdiff3
- #cmd.diffmerge = /usr/bin/diffmerge
- [merge-tools]
- # Override stock tool location
- kdiff3.executable = /usr/bin/kdiff3
- # Specify command line
- kdiff3.args = $base $local $other -o $output
- # Give higher priority
- kdiff3.priority = 1
- diffmerge.executable = /usr/bin/diffmerge
- diffmerge.args = -merge -result=$output -t1="Local Version" -t2=$output -t3="Other Version" -caption=$output $local $base $other
- diffmerge.binary = False
- diffmerge.symlinks = False
- diffmerge.gui = True
- [tortoisehg]
- fontcomment = Droid Sans,16,-1,5,50,0,0,0,0,0
- fontdiff = Droid Sans,16,-1,5,50,0,0,0,0,0
- fontlist = Droid Sans,16,-1,5,50,0,0,0,0,0
- fontlog = Droid Sans,16,-1,5,50,0,0,0,0,0
- fontoutputlog = Droid Sans,16,-1,5,50,0,0,0,0,0
- summarylen = 80
- vdiff = kdiff3
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement