OSDN Git Service
(root)
/
git-core
/
git.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'jm/mergetool-pathspec' into maint-1.7.6
[git-core/git.git]
/
Documentation
/
git-mergetool.txt
diff --git
a/Documentation/git-mergetool.txt
b/Documentation/git-mergetool.txt
index
f1f4e7a
..
2a49de7
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