Andrew's git
/
gitweb.git
/ blobdiff
summary
|
log
|
commit
|
diff
|
tree
commit
grep
author
committer
pickaxe
?
re
git-remote-mediawiki: allow a domain to be set for authentication
[gitweb.git]
/
Documentation
/
git-mergetool.txt
diff --git
a/Documentation/git-mergetool.txt
b/Documentation/git-mergetool.txt
index 8c79ae8d2a610bf4f1dea1a840bfc52e85d90fd9..347091010995af95e43ced744b159b277bdb6cdc 100644
(file)
--- a/
Documentation/git-mergetool.txt
+++ b/
Documentation/git-mergetool.txt
@@
-7,6
+7,7
@@
git-mergetool - Run merge conflict resolution tools to resolve merge conflicts
SYNOPSIS
--------
+[verse]
'git mergetool' [--tool=<tool>] [-y|--no-prompt|--prompt] [<file>...]
DESCRIPTION