diff options
author | Theodore Ts'o <tytso@mit.edu> | 2007-03-06 00:05:16 -0500 |
---|---|---|
committer | Theodore Ts'o <tytso@mit.edu> | 2007-03-13 20:14:05 -0400 |
commit | c4b4a5af1604a7546c0b0786e47bcff8a47a6039 (patch) | |
tree | 31a585ea3f75de124e44ab415316a16857e8b6b7 /Documentation/config.txt | |
parent | 27ebd6e0443bdd795869f598ecebc9eadd64a26c (diff) | |
download | git-c4b4a5af1604a7546c0b0786e47bcff8a47a6039.tar.gz git-c4b4a5af1604a7546c0b0786e47bcff8a47a6039.tar.xz |
Add git-mergetool to run an appropriate merge conflict resolution program
The git-mergetool program can be used to automatically run an appropriate
merge resolution program to resolve merge conflicts. It will automatically
run one of kdiff3, tkdiff, meld, xxdiff, or emacs emerge programs.
Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
Diffstat (limited to 'Documentation/config.txt')
-rw-r--r-- | Documentation/config.txt | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/Documentation/config.txt b/Documentation/config.txt index 5408dd67d..aaae9ac30 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -453,6 +453,11 @@ merge.summary:: Whether to include summaries of merged commits in newly created merge commit messages. False by default. +merge.tool:: + Controls which merge resolution program is used by + gitlink:git-mergetool[l]. Valid values are: "kdiff3", "tkdiff", + "meld", "xxdiff", "emerge" + merge.verbosity:: Controls the amount of output shown by the recursive merge strategy. Level 0 outputs nothing except a final error |