Mercurial > public > mercurial-scm > hg

comparison hgext/extdiff.py @ 3127: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 eeaf9bcdfa25
children f145d04899d2
comparison
equal deleted inserted replaced
3096:f422c8265ae5 3127:8e8deb8035a4
21 # 21 #
22 # [extdiff] 22 # [extdiff]
23 # # add new command that runs GNU diff(1) in 'context diff' mode 23 # # add new command that runs GNU diff(1) in 'context diff' mode
24 # cmd.cdiff = gdiff 24 # cmd.cdiff = gdiff
25 # opts.cdiff = -Nprc5 25 # opts.cdiff = -Nprc5
26
26 # # add new command called vdiff, runs kdiff3 27 # # add new command called vdiff, runs kdiff3
27 # cmd.vdiff = kdiff3 28 # cmd.vdiff = kdiff3
29
28 # # add new command called meld, runs meld (no need to name twice) 30 # # add new command called meld, runs meld (no need to name twice)
29 # cmd.meld = 31 # cmd.meld =
32
30 # # add new command called vimdiff, runs gvimdiff with DirDiff plugin 33 # # add new command called vimdiff, runs gvimdiff with DirDiff plugin
31 # #(see http://www.vim.org/scripts/script.php?script_id=102) 34 # #(see http://www.vim.org/scripts/script.php?script_id=102)
32 # cmd.vimdiff = LC_ALL=C gvim -f '+bdel 1 2' '+ execute "DirDiff ".argv(0)." ".argv(1)' 35 # # Non english user, be sure to put "let g:DirDiffDynamicDiffText = 1" in
36 # # your .vimrc
37 # cmd.vimdiff = gvim
38 # opts.vimdiff = -f '+next' '+execute "DirDiff" argv(0) argv(1)'
33 # 39 #
34 # Each custom diff commands can have two parts: a `cmd' and an `opts' 40 # Each custom diff commands can have two parts: a `cmd' and an `opts'
35 # part. The cmd.xxx option defines the name of an executable program 41 # part. The cmd.xxx option defines the name of an executable program
36 # that will be run, and opts.xxx defines a set of command-line options 42 # that will be run, and opts.xxx defines a set of command-line options
37 # which will be inserted to the command between the program name and 43 # which will be inserted to the command between the program name and