Andrew's git
/
gitweb.git
/ blobdiff
summary
|
log
|
commit
|
diff
|
tree
commit
grep
author
committer
pickaxe
?
re
ls-remote doc: fix example invocation on git.git
[gitweb.git]
/
Documentation
/
git-mergetool.txt
diff --git
a/Documentation/git-mergetool.txt
b/Documentation/git-mergetool.txt
index 6b563c500f660486951cbcac62876bbda5cc3975..07137f252b0fd57a671ef69884bea893cdd7767c 100644
(file)
--- a/
Documentation/git-mergetool.txt
+++ b/
Documentation/git-mergetool.txt
@@
-8,7
+8,7
@@
git-mergetool - Run merge conflict resolution tools to resolve merge conflicts
SYNOPSIS
--------
[verse]
-'git mergetool' [--tool=<tool>] [-y
|--no-prompt|--
prompt] [<file>...]
+'git mergetool' [--tool=<tool>] [-y
| --[no-]
prompt] [<file>...]
DESCRIPTION
-----------