index 86aad37c6acaf0c37995221456bffc61ed3bc883..f35d0e1b4560a4970e7423011b585e1ff7d538c1 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
GIT
---
Part of the gitlink:git[7] suite
-