Advertisement
Guest User

Untitled

a guest
Jun 7th, 2016
74
0
Never
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
text 0.70 KB | None | 0 0
  1. # Generated by TortoiseHg settings dialog
  2.  
  3.  
  4. [ui]
  5. username = astree
  6. merge = bcomp
  7.  
  8. [diff]
  9. git = True
  10.  
  11. [extensions]
  12. extdiff =
  13.  
  14. [extdiff]
  15. cmd.bcomp = /usr/local/bin/bcomp
  16. #opts.bcomp = -ro
  17.  
  18. [merge-tools]
  19. bcomp.executable = /usr/local/bin/bcomp
  20. bcomp.args = $local $other $base $output
  21. bcomp.priority = 1
  22. bcomp.premerge = True
  23. bcomp.gui = True
  24.  
  25. [hostfingerprints]
  26. source.holition.com = e0:a4:73:97:47:40:a8:57:be:00:97:ac:82:cb:2c:f9:34:1b:dc:66
  27.  
  28. [auth]
  29. source.holition.com.prefix = source.holition.com
  30. source.holition.com.username = astree
  31. source.holition.com.password = astree
  32.  
  33. [extensions]
  34. mq =
  35. hgflow = /Users/holitiondev/hgflow.py
  36.  
  37. [insecurehosts]
  38.  
  39. [flow]
  40. autoshelve = false
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement