Created
May 16, 2010 20:53
-
-
Save mhinze/403158 to your computer and use it in GitHub Desktop.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
[auth] | |
bb1.prefix = https://bitbucket.org/ | |
bb1.username = {{personal username}} | |
bb1.password = {{personal password}} | |
bb2.prefix = https://bitbucket.org/{{work account}}/ | |
bb2.username = {{work username}} | |
bb2.password = {{work password}} | |
bb3.prefix = https://{{work username}}@bitbucket.org/{{work account}}/ | |
bb3.password = {{work password}} | |
[ui] | |
editor = vim | |
[extensions] | |
rebase = | |
localbranch = c:\dev\oss\hg\mercurial-extensions-localbranch\localbranch.py | |
color = | |
graphlog = | |
progress = | |
[alias] | |
nudge = push --rev . | |
show = log --color=always -pr | |
ar = addremove --similarity 100 | |
clog = glog --style compact -l | |
[extdiff] | |
cmd.winmerge = C:\Program Files (x86)\WinMerge\WinMergeU.exe | |
opts.winmerge = /e /x /u /wl | |
[merge-tools] | |
winmergeu.executable = C:\Program Files (x86)\WinMerge\WinMergeU.exe | |
winmergeu.priority= 1 | |
winmergeu.fixeol=True | |
winmergeu.checkchanged=True | |
winmergeu.args= /e /u /dl other /dr local $other $local $output | |
winmergeu.gui=False | |
[tortoisehg] | |
vdiff = winmerge |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment