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/config.txt | |
| parent | e58db03bbee4af96e60b6ac88b84c1c11b8b037e (diff) | |
| download | git-730b5b45fb8a7751106885d350466c197b671b1c.tar.gz | |
[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/config.txt')
| -rw-r--r-- | Documentation/config.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/config.txt b/Documentation/config.txt index de408b6571..a2057d9d24 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -531,7 +531,7 @@ merge.summary:: merge.tool:: Controls which merge resolution program is used by gitlink:git-mergetool[l]. Valid values are: "kdiff3", "tkdiff", - "meld", "xxdiff", "emerge", "vimdiff", and "opendiff" + "meld", "xxdiff", "emerge", "vimdiff", "gvimdiff", and "opendiff". merge.verbosity:: Controls the amount of output shown by the recursive merge |