Mercurial > hg
changeset 3128:70e62df12704
Merge with mainline
author | Benoit Boissinot <benoit.boissinot@ens-lyon.org> |
---|---|
date | Mon, 18 Sep 2006 11:55:38 +0200 |
parents | 8e8deb8035a4 (diff) 2ef0b3aae186 (current diff) |
children | f145d04899d2 |
files | mercurial/util.py tests/test-trusted.py tests/test-trusted.py.out |
diffstat | 1 files changed, 7 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/hgext/extdiff.py Sun Sep 17 21:27:30 2006 -0500 +++ b/hgext/extdiff.py Mon Sep 18 11:55:38 2006 +0200 @@ -23,13 +23,19 @@ # # add new command that runs GNU diff(1) in 'context diff' mode # cmd.cdiff = gdiff # opts.cdiff = -Nprc5 + # # add new command called vdiff, runs kdiff3 # cmd.vdiff = kdiff3 + # # add new command called meld, runs meld (no need to name twice) # cmd.meld = + # # add new command called vimdiff, runs gvimdiff with DirDiff plugin # #(see http://www.vim.org/scripts/script.php?script_id=102) -# cmd.vimdiff = LC_ALL=C gvim -f '+bdel 1 2' '+ execute "DirDiff ".argv(0)." ".argv(1)' +# # Non english user, be sure to put "let g:DirDiffDynamicDiffText = 1" in +# # your .vimrc +# cmd.vimdiff = gvim +# opts.vimdiff = -f '+next' '+execute "DirDiff" argv(0) argv(1)' # # Each custom diff commands can have two parts: a `cmd' and an `opts' # part. The cmd.xxx option defines the name of an executable program