Advertisement
evandrix

~/.hgrc

Sep 15th, 2011
99
0
Never
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
Bash 0.92 KB | None | 0 0
  1. [ui]
  2. username = Lee Wei <leewei@lshift.net>
  3. verbose = True
  4. merge = kdiff3
  5.  
  6. [extensions]
  7. hgext.extdiff =
  8. color =
  9. mq =
  10. pager =
  11.  
  12. [extdiff]
  13. cmd.kdiff3 = /usr/bin/kdiff3
  14. #cmd.diffmerge = /usr/bin/diffmerge
  15.  
  16. [merge-tools]
  17. # Override stock tool location
  18. kdiff3.executable = /usr/bin/kdiff3
  19. # Specify command line
  20. kdiff3.args = $base $local $other -o $output
  21. # Give higher priority
  22. kdiff3.priority = 1
  23.  
  24. diffmerge.executable = /usr/bin/diffmerge
  25. diffmerge.args = -merge -result=$output -t1="Local Version" -t2=$output -t3="Other Version" -caption=$output $local $base $other
  26. diffmerge.binary = False
  27. diffmerge.symlinks = False
  28. diffmerge.gui = True
  29.  
  30. [tortoisehg]
  31. fontcomment = Droid Sans,16,-1,5,50,0,0,0,0,0
  32. fontdiff = Droid Sans,16,-1,5,50,0,0,0,0,0
  33. fontlist = Droid Sans,16,-1,5,50,0,0,0,0,0
  34. fontlog = Droid Sans,16,-1,5,50,0,0,0,0,0
  35. fontoutputlog = Droid Sans,16,-1,5,50,0,0,0,0,0
  36. summarylen = 80
  37. vdiff = kdiff3
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement