# HG changeset patch
# User Benoit Boissinot <benoit.boissinot@ens-lyon.org>
# Date 1158573338 -7200
# Node ID 70e62df127047b908e626836d6e28b3a0078dada
# Parent  8e8deb8035a4aaa1c2b3d1f3be0d723dca919424# Parent  2ef0b3aae186c8a4130ea8ced0a7667c46936623
Merge with mainline

diff -r 2ef0b3aae186 -r 70e62df12704 hgext/extdiff.py
--- 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
diff -r 2ef0b3aae186 -r 70e62df12704 mercurial/util.py