diff options
| author | Junio C Hamano <junio@hera.kernel.org> | 2008-12-10 08:35:25 +0000 |
|---|---|---|
| committer | Junio C Hamano <junio@hera.kernel.org> | 2008-12-10 08:35:25 +0000 |
| commit | ec87f52676ecc7be43d1d7740a679a42b3192a01 (patch) | |
| tree | b8f74c54892b5aab6da3073eafc5216d05a2c174 /git-mergetool.txt | |
| parent | b4028862764a27387da066ed28437f51376835cd (diff) | |
| download | git-htmldocs-ec87f52676ecc7be43d1d7740a679a42b3192a01.tar.gz | |
Autogenerated HTML docs for v1.6.1-rc2-14-g5363d
Diffstat (limited to 'git-mergetool.txt')
| -rw-r--r-- | git-mergetool.txt | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/git-mergetool.txt b/git-mergetool.txt index e0b2703b3..602e7c6d3 100644 --- a/git-mergetool.txt +++ b/git-mergetool.txt @@ -38,7 +38,7 @@ can configure the absolute path to kdiff3 by setting `mergetool.kdiff3.path`. Otherwise, 'git-mergetool' assumes the tool is available in PATH. + -Instead of running one of the known merge tool programs +Instead of running one of the known merge tool programs, 'git-mergetool' can be customized to run an alternative program by specifying the command line to invoke in a configuration variable `mergetool.<tool>.cmd`. @@ -55,7 +55,7 @@ of the file to which the merge tool should write the result of the merge resolution. + If the custom merge tool correctly indicates the success of a -merge resolution with its exit code then the configuration +merge resolution with its exit code, then the configuration variable `mergetool.<tool>.trustExitCode` can be set to `true`. Otherwise, 'git-mergetool' will prompt the user to indicate the success of the resolution after the custom tool has exited. |