equal
deleted
inserted
replaced
31 |
31 |
32 # add new command called vimdiff, runs gvimdiff with DirDiff plugin |
32 # add new command called vimdiff, runs gvimdiff with DirDiff plugin |
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 |
40 $parent1, $plabel1 - filename, descriptive label of first parent |
41 $parent1, $plabel1 - filename, descriptive label of first parent |
41 $child, $clabel - filename, descriptive label of child revision |
42 $child, $clabel - filename, descriptive label of child revision |