index 86aad37c6acaf0c37995221456bffc61ed3bc883..f80ab3b8c479d787e116298f5446d1ff57ff2774 100644 (file)
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