diff options
| author |  James Bowes <jbowes@dangerouslyinc.com> | 2007-03-18 22:11:54 -0400 |
|---|---|---|
| committer |  Theodore Ts'o <tytso@mit.edu> | 2007-03-18 22:13:48 -0400 |
| commit | 9cec65399d3575774910b21c1cfd762a5e88a245 (patch) | |
| tree | ea9a9901df003f61123a0dc68980d9200e0f7ecb /Documentation | |
| parent | Update main git.html page to point at 1.5.0.5 documentation (diff) | |
| download | tgif-9cec65399d3575774910b21c1cfd762a5e88a245.tar.xz | |
mergetool: Add support for vimdiff.
Signed-off-by: James Bowes <jbowes@dangerouslyinc.com>
Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/config.txt | 2 | ||||
| -rw-r--r-- | Documentation/git-mergetool.txt | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/Documentation/config.txt b/Documentation/config.txt index 953acaee4c..66886424bb 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -460,7 +460,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" + "meld", "xxdiff", "emerge", "vimdiff" merge.verbosity:: Controls the amount of output shown by the recursive merge 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=<tool>:: Use the merge resolution program specified by <tool>. 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 |