From 730b5b45fb8a7751106885d350466c197b671b1c Mon Sep 17 00:00:00 2001 From: Dan McGee Date: Tue, 5 Jun 2007 21:19:47 -0400 Subject: [PATCH] git-mergetool: Allow gvimdiff to be used as a mergetool Signed-off-by: Dan McGee Acked-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 b89c51c65b..6c32c6d18e 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, emerge, vimdiff, and opendiff + kdiff3, tkdiff, meld, xxdiff, emerge, vimdiff, gvimdiff, and opendiff + If a merge resolution program is not specified, 'git mergetool' will use the configuration variable merge.tool. If the -- cgit v1.3-5-g45d5