diff options
author | Lorry Tar Creator <lorry-tar-importer@baserock.org> | 2011-10-01 20:49:36 +0000 |
---|---|---|
committer | Lorry <lorry@roadtrain.codethink.co.uk> | 2012-09-27 13:27:51 +0000 |
commit | 921ced43c48c1d170452a7b251b94cc96ec8dd44 (patch) | |
tree | 3c4a89176ea67fe4c7bf7b375488361a823c95fa /contrib/win32/mercurial.ini | |
parent | 9039c805b0a7e36220101323f82735f08a104b37 (diff) | |
download | mercurial-tarball-master.tar.gz |
Imported from /srv/lorry/lorry-area/mercurial-tarball/mercurial-1.9.3.tar.gz.HEADmercurial-1.9.3master
Diffstat (limited to 'contrib/win32/mercurial.ini')
-rw-r--r-- | contrib/win32/mercurial.ini | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/contrib/win32/mercurial.ini b/contrib/win32/mercurial.ini index b8eac56..db81645 100644 --- a/contrib/win32/mercurial.ini +++ b/contrib/win32/mercurial.ini @@ -36,6 +36,7 @@ editor = notepad ;
[extensions]
;acl =
+;alias =
;bugzilla =
;children =
;churn =
@@ -49,9 +50,7 @@ editor = notepad ;hgcia =
;hgk =
;highlight =
-;histedit =
;interhg =
-;largefiles =
;keyword =
;mq =
;notify =
@@ -61,9 +60,6 @@ editor = notepad ;purge =
;rebase =
;record =
-;relink =
-;schemes =
-;share =
;transplant =
;win32mbcs =
;zeroconf =
@@ -75,7 +71,7 @@ editor = notepad ;cmd.bc3diff = C:\Program Files\Beyond Compare 3\BCompare.exe
;cmd.vdiff = C:\Progra~1\TortoiseSVN\bin\TortoiseMerge.exe
;cmd.vimdiff = gvim.exe
-;opts.vimdiff = -f "+next" "+execute 'DirDiff' fnameescape(argv(0)) fnameescape(argv(1))"
+;opts.vimdiff = -f '+next' '+execute "DirDiff ".argv(0)." ".argv(1)'
[hgk]
|