Andrew's git
/
gitweb.git
/ blobdiff
summary
|
log
|
commit
|
diff
|
tree
commit
grep
author
committer
pickaxe
?
re
rearrange delta search progress reporting
[gitweb.git]
/
Documentation
/
git-merge-file.txt
diff --git
a/Documentation/git-merge-file.txt
b/Documentation/git-merge-file.txt
index 0b41d66a70dd7e36854bcc10706202bd4e1880a1..31882abb870b9720b2e7343638ef1c92eed8b2d9 100644
(file)
--- a/
Documentation/git-merge-file.txt
+++ b/
Documentation/git-merge-file.txt
@@
-1,9
+1,9
@@
git-merge-file(1)
-============
+============
=====
NAME
----
-git-merge-file -
three
way file merge
+git-merge-file -
Run a three-
way file merge
SYNOPSIS