equal
deleted
inserted
replaced
299 |
299 |
300 # add new command called vimdiff, runs gvimdiff with DirDiff plugin |
300 # add new command called vimdiff, runs gvimdiff with DirDiff plugin |
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 |
308 $parent1, $plabel1 - filename, descriptive label of first parent |
309 $parent1, $plabel1 - filename, descriptive label of first parent |
309 $child, $clabel - filename, descriptive label of child revision |
310 $child, $clabel - filename, descriptive label of child revision |