Andrew's git
/
gitweb.git
/ blobdiff
summary
|
log
|
commit
|
diff
|
tree
commit
grep
author
committer
pickaxe
?
re
t9501-*.sh: Fix a test failure on Cygwin
[gitweb.git]
/
Documentation
/
git-mergetool.txt
diff --git
a/Documentation/git-mergetool.txt
b/Documentation/git-mergetool.txt
index e4ed0161467866f731c89eb48e64453051c64281..1f75a848ba36728eeaa67e5cbbc209075393193b 100644
(file)
--- a/
Documentation/git-mergetool.txt
+++ b/
Documentation/git-mergetool.txt
@@
-7,7
+7,7
@@
git-mergetool - Run merge conflict resolution tools to resolve merge conflicts
SYNOPSIS
--------
-'git mergetool' [--tool=<tool>] [-y|--no-prompt|--prompt] [<file>
]...
+'git mergetool' [--tool=<tool>] [-y|--no-prompt|--prompt] [<file>
...]
DESCRIPTION
-----------