index 29d3faa556f8e7148edd9f01d1ffa870e78502b8..31882abb870b9720b2e7343638ef1c92eed8b2d9 100644 (file)
NAME
----
NAME
----
-git-merge-file - three-way file merge
+git-merge-file - Run a three-way file merge
SYNOPSIS
SYNOPSIS