diff options
| author | Junio C Hamano <junkio@cox.net> | 2007-03-30 06:08:45 (GMT) |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2007-03-30 06:09:40 (GMT) |
| commit | 18acb3e6c76b42d109cac956d63a1c709b0d76b2 (patch) | |
| tree | dc303fce1e4174977a8cfc24147ce6bcb83c8a4d /Documentation | |
| parent | 7685227e973fce34340d3766b1775263751afa56 (diff) | |
| parent | 27090aa1eabdc44553a0d8a51ff4ab9543c64c65 (diff) | |
| download | git-18acb3e6c76b42d109cac956d63a1c709b0d76b2.zip git-18acb3e6c76b42d109cac956d63a1c709b0d76b2.tar.gz git-18acb3e6c76b42d109cac956d63a1c709b0d76b2.tar.bz2 | |
Merge branch 'master' of git://repo.or.cz/git/mergetool.git
* 'master' of git://repo.or.cz/git/mergetool.git:
mergetool: Clean up description of files and prompts for merge resolutions
mergetool: Make git-rm quiet when resolving a deleted file conflict
mergetool: Add support for Apple Mac OS X's opendiff command
mergetool: Fix abort command when resolving symlinks and deleted files
mergetool: Remove spurious error message if merge.tool config option not set
mergetool: factor out common code
mergetool: portability fix: don't use reserved word function
mergetool: portability fix: don't assume true is in /bin
mergetool: Don't error out in the merge case where the local file is deleted
mergetool: Replace use of "echo -n" with printf(1) to be more portable
Fix minor formatting issue in man page for git-mergetool
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/git-mergetool.txt | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/Documentation/git-mergetool.txt b/Documentation/git-mergetool.txt index 5baaaca..34288fe 100644 --- a/Documentation/git-mergetool.txt +++ b/Documentation/git-mergetool.txt @@ -26,11 +26,11 @@ OPTIONS Use the merge resolution program specified by <tool>. Valid merge tools are: 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 - configuration variable merge.tool is not set, 'git mergetool' - will pick a suitable default. ++ +If a merge resolution program is not specified, 'git mergetool' +will use the configuration variable merge.tool. If the +configuration variable merge.tool is not set, 'git mergetool' +will pick a suitable default. Author ------ |