Advertisement
Not a member of Pastebin yet?
Sign Up,
it unlocks many cool features!
- # Generated by TortoiseHg settings dialog
- [ui]
- username = Volvenko.NI
- merge=codecompare_merge
- [auth]
- hg.dns-shop.ru.prefix = hg.dns-shop.ru
- hg.dns-shop.ru.username = Volvenko.NI
- hg.dns-shop.ru.password=
- bitbucket.org.prefix = bitbucket.org
- bitbucket.org.username = Volvenko
- bitbucket.org.password =
- [extensions]
- rebase =
- strip =
- largefiles =
- extdiff =
- histedit =
- mq =
- shelve =
- [largefiles]
- minsize = 3
- [tortoisehg]
- vdiff = codecompare_diff
- [merge-tools]
- codecompare_merge.regkey=SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\CodeCompare_is1
- codecompare_merge.regname=InstallLocation
- codecompare_merge.regappend=CodeMerge.exe
- 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"
- codecompare_merge.binary=False
- codecompare_merge.gui=True
- codecompare_merge.checkconflicts=True
- codecompare_merge.premerge=Keep
- [extdiff]
- cmd.codecompare=C:\Program Files\Devart\Code Compare\CodeCompare.exe
- opts.codecompare=/SC=Hg /W /title1="$plabel1" /title2="$clabel" $parent $child
- [merge-patterns]
- *.*=codecompare_merge
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement