diff options
| author |  Dan McGee <dpmcgee@gmail.com> | 2007-06-05 21:19:47 -0400 |
|---|---|---|
| committer |  Theodore Ts'o <tytso@mit.edu> | 2007-06-10 08:27:29 -0400 |
| commit | 730b5b45fb8a7751106885d350466c197b671b1c (patch) | |
| tree | 044bfa742a590ca404b1d92233a6eed7c6a7f6c0 /Documentation/git-mergetool.txt | |
| parent | Merge branch 'maint' (diff) | |
| download | tgif-730b5b45fb8a7751106885d350466c197b671b1c.tar.xz | |
[PATCH] git-mergetool: Allow gvimdiff to be used as a mergetool
Signed-off-by: Dan McGee <dpmcgee@gmail.com>
Acked-by: "Theodore Ts'o" <tytso@mit.edu>
Diffstat (limited to 'Documentation/git-mergetool.txt')
| -rw-r--r-- | Documentation/git-mergetool.txt | 2 |
1 files changed, 1 insertions, 1 deletions
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=<tool>:: Use the merge resolution program specified by <tool>. 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 |