Mercurial > hg > gitserve

changeset 3133:8e8deb8035a4

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Update [extdiff] configuration sample for vimdiff, taking acount cmd.xxx and opts.xxx configurations item.
author Mathieu Clabaut <mathieu.clabaut@systerel.fr>
date Fri, 15 Sep 2006 22:55:17 +0200
parents f422c8265ae5
children 70e62df12704
files hgext/extdiff.py
diffstat 1 files changed, 7 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/hgext/extdiff.py	Wed Sep 13 13:14:08 2006 -0700
+++ b/hgext/extdiff.py	Fri Sep 15 22:55:17 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