Mercurial > hg
diff contrib/win32/mercurial.ini @ 16242:55174ab81973 stable
extdiff: escape filenames with vim/DirDiff and make quoting work with Windows
Use vim function fnameescape() on filenames.
Use double quotes for arguments so cmd.exe is happy.
author | Thomas Arendsen Hein <thomas@intevation.de> |
---|---|
date | Mon, 12 Mar 2012 09:39:30 +0100 |
parents | a4049424cb51 |
children | ef5d70655143 |
line wrap: on
line diff
--- a/contrib/win32/mercurial.ini Thu Mar 08 13:35:27 2012 -0600 +++ b/contrib/win32/mercurial.ini Mon Mar 12 09:39:30 2012 +0100 @@ -71,7 +71,7 @@ ;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 ".argv(0)." ".argv(1)' +;opts.vimdiff = -f "+next" "+execute 'DirDiff' fnameescape(argv(0)) fnameescape(argv(1))" [hgk]