Fall back to three-way merge when applying a patch.

diff --git a/git-format-patch.sh b/git-format-patch.sh
index 2844799535a4c63f61f6c94cf7a66c88d0052656..9378219d846dcbd947ab63bd6d728aaac24e8ea3 100755 (executable)
--- a/git-format-patch.sh
+++ b/git-format-patch.sh
@@ -212,7 +212,10 @@ Date: '"$ad"
        echo
        git-diff-tree -p $diff_opts "$commit" | git-apply --stat --summary
        echo
+       git-cat-file commit "$commit^" | sed -e 's/^tree /applies-to: /' -e q
        git-diff-tree -p $diff_opts "$commit"
+       echo "---"
+       echo "@@GIT_VERSION@@"
 
        case "$mbox" in
        t)