Advertisement
Guest User

Untitled

a guest
Apr 27th, 2018
219
0
Never
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
text 1.15 KB | None | 0 0
  1. # Generated by TortoiseHg settings dialog
  2.  
  3.  
  4. [ui]
  5. username = Volvenko.NI
  6. merge=codecompare_merge
  7.  
  8. [auth]
  9. hg.dns-shop.ru.prefix = hg.dns-shop.ru
  10. hg.dns-shop.ru.username = Volvenko.NI
  11. hg.dns-shop.ru.password=
  12. bitbucket.org.prefix = bitbucket.org
  13. bitbucket.org.username = Volvenko
  14. bitbucket.org.password =
  15.  
  16.  
  17. [extensions]
  18. rebase =
  19. strip =
  20. largefiles =
  21. extdiff =
  22. histedit =
  23. mq =
  24. shelve =
  25.  
  26.  
  27. [largefiles]
  28. minsize = 3
  29.  
  30.  
  31. [tortoisehg]
  32. vdiff = codecompare_diff
  33.  
  34. [merge-tools]
  35. codecompare_merge.regkey=SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\CodeCompare_is1
  36. codecompare_merge.regname=InstallLocation
  37. codecompare_merge.regappend=CodeMerge.exe
  38. codecompare_merge.args=/SC=Hg /TF=$other /MF=$local /RF=$output /BF=$base /TT="Other: $other" /MT="Local: $local" /RT="Output: $output" /BT="Base: $base"
  39. codecompare_merge.binary=False
  40. codecompare_merge.gui=True
  41. codecompare_merge.checkconflicts=True
  42. codecompare_merge.premerge=Keep
  43.  
  44. [extdiff]
  45. cmd.codecompare=C:\Program Files\Devart\Code Compare\CodeCompare.exe
  46. opts.codecompare=/SC=Hg /W /title1="$plabel1" /title2="$clabel" $parent $child
  47.  
  48. [merge-patterns]
  49. *.*=codecompare_merge
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement