From 9cec65399d3575774910b21c1cfd762a5e88a245 Mon Sep 17 00:00:00 2001 From: James Bowes Date: Sun, 18 Mar 2007 22:11:54 -0400 Subject: mergetool: Add support for vimdiff. Signed-off-by: James Bowes Signed-off-by: "Theodore Ts'o" --- Documentation/git-mergetool.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Documentation/git-mergetool.txt') diff --git a/Documentation/git-mergetool.txt b/Documentation/git-mergetool.txt index ae69a0eb83..5baaaca0b5 100644 --- a/Documentation/git-mergetool.txt +++ b/Documentation/git-mergetool.txt @@ -25,7 +25,7 @@ OPTIONS -t or --tool=:: Use the merge resolution program specified by . Valid merge tools are: - kdiff3, tkdiff, meld, xxdiff, and emerge. + kdiff3, tkdiff, meld, xxdiff, emerge, and vimdiff. If a merge resolution program is not specified, 'git mergetool' will use the configuration variable merge.tool. If the -- cgit v1.2.1