merge-recursive: handle D/F conflict case more carefully.

diff --git a/git-send-email.perl b/git-send-email.perl
index ae50990d081c3709c0a498422be382b9a632f5ec..1278fcba462f632a3687742f74cc15c0498874e2 100755 (executable)
--- a/git-send-email.perl
+++ b/git-send-email.perl
@@ -595,7 +595,7 @@ sub send_message
        if ($chain_reply_to || !defined $reply_to || length($reply_to) == 0) {
                $reply_to = $message_id;
                if (length $references > 0) {
-                       $references .= " $message_id";
+                       $references .= "\n $message_id";
                } else {
                        $references = "$message_id";
                }