tokkee.org
Code
projects
/
git.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
rev-list documentation: add "--bisect-all".
[git.git]
/
Documentation
/
git-merge-file.txt
diff --git
a/Documentation/git-merge-file.txt
b/Documentation/git-merge-file.txt
index 29d3faa556f8e7148edd9f01d1ffa870e78502b8..31882abb870b9720b2e7343638ef1c92eed8b2d9 100644
(file)
--- a/
Documentation/git-merge-file.txt
+++ b/
Documentation/git-merge-file.txt
@@
-3,7
+3,7
@@
git-merge-file(1)
NAME
----
-git-merge-file - three-way file merge
+git-merge-file -
Run a
three-way file merge
SYNOPSIS