##// END OF EJS Templates
extdiff: escape filenames with vim/DirDiff and make quoting work with Windows...
Thomas Arendsen Hein -
r16242:55174ab8 stable
parent child Browse files
Show More
@@ -71,7 +71,7 b' editor = notepad'
71 ;cmd.bc3diff = C:\Program Files\Beyond Compare 3\BCompare.exe
71 ;cmd.bc3diff = C:\Program Files\Beyond Compare 3\BCompare.exe
72 ;cmd.vdiff = C:\Progra~1\TortoiseSVN\bin\TortoiseMerge.exe
72 ;cmd.vdiff = C:\Progra~1\TortoiseSVN\bin\TortoiseMerge.exe
73 ;cmd.vimdiff = gvim.exe
73 ;cmd.vimdiff = gvim.exe
74 ;opts.vimdiff = -f '+next' '+execute "DirDiff ".argv(0)." ".argv(1)'
74 ;opts.vimdiff = -f "+next" "+execute 'DirDiff' fnameescape(argv(0)) fnameescape(argv(1))"
75
75
76
76
77 [hgk]
77 [hgk]
@@ -33,7 +33,8 b' you do not need to type :hg:`extdiff -p '
33 # (see http://www.vim.org/scripts/script.php?script_id=102) Non
33 # (see http://www.vim.org/scripts/script.php?script_id=102) Non
34 # English user, be sure to put "let g:DirDiffDynamicDiffText = 1" in
34 # English user, be sure to put "let g:DirDiffDynamicDiffText = 1" in
35 # your .vimrc
35 # your .vimrc
36 vimdiff = gvim -f '+next' '+execute "DirDiff" argv(0) argv(1)'
36 vimdiff = gvim -f "+next" \\
37 "+execute 'DirDiff' fnameescape(argv(0)) fnameescape(argv(1))"
37
38
38 Tool arguments can include variables that are expanded at runtime::
39 Tool arguments can include variables that are expanded at runtime::
39
40
@@ -301,7 +301,8 b' Extension module help vs command help:'
301 # (see http://www.vim.org/scripts/script.php?script_id=102) Non
301 # (see http://www.vim.org/scripts/script.php?script_id=102) Non
302 # English user, be sure to put "let g:DirDiffDynamicDiffText = 1" in
302 # English user, be sure to put "let g:DirDiffDynamicDiffText = 1" in
303 # your .vimrc
303 # your .vimrc
304 vimdiff = gvim -f '+next' '+execute "DirDiff" argv(0) argv(1)'
304 vimdiff = gvim -f "+next" \
305 "+execute 'DirDiff' fnameescape(argv(0)) fnameescape(argv(1))"
305
306
306 Tool arguments can include variables that are expanded at runtime:
307 Tool arguments can include variables that are expanded at runtime:
307
308
General Comments 0
You need to be logged in to leave comments. Login now