merge-recursive: Move rename/delete handling into dedicated function

diff --git a/Documentation/git-patch-id.txt b/Documentation/git-patch-id.txt
index 253fc0fc255a0f82778d120647031eaa66eb647a..4dae1390a5c663867b93e1dce6cd4d2bf59e84ab 100644 (file)
--- a/Documentation/git-patch-id.txt
+++ b/Documentation/git-patch-id.txt
@@ -18,7 +18,7 @@ ID" are almost guaranteed to be the same thing.
 
 IOW, you can use this thing to look for likely duplicate commits.
 
-When dealing with 'git-diff-tree' output, it takes advantage of
+When dealing with 'git diff-tree' output, it takes advantage of
 the fact that the patch is prefixed with the object name of the
 commit, and outputs two 40-byte hexadecimal strings.  The first
 string is the patch ID, and the second string is the commit ID.