Andrew's git
/
gitweb.git
/ blobdiff
summary
|
log
|
commit
|
diff
|
tree
commit
grep
author
committer
pickaxe
?
re
core-tutorial: http reference link fix
[gitweb.git]
/
Documentation
/
git-merge-one-file.txt
diff --git
a/Documentation/git-merge-one-file.txt
b/Documentation/git-merge-one-file.txt
index 86aad37c6acaf0c37995221456bffc61ed3bc883..f80ab3b8c479d787e116298f5446d1ff57ff2774 100644
(file)
--- a/
Documentation/git-merge-one-file.txt
+++ b/
Documentation/git-merge-one-file.txt
@@
-3,7
+3,7
@@
git-merge-one-file(1)
NAME
----
-git-merge-one-file - The standard helper program to use with
"git-merge-index"
+git-merge-one-file - The standard helper program to use with
git-merge-index
SYNOPSIS