checkout: use --aggressive when running a 3-way merge (-m).

[git.git] / imap-send.c

diff --git a/imap-send.c b/imap-send.c
index ea56dc9ae5e2110c88a3538a9559a6e6d0adb23c..52e2400b57118e7f9a27c85212e1c539d16add7c 100644 (file)
--- a/imap-send.c
+++ b/imap-send.c
@@ -1202,6 +1202,7 @@ read_message( FILE *f, msg_data_t *msg )
                        p = xrealloc(msg->data, len+1);
                        if (!p)
                                break;
+                       msg->data = p;
                }
                r = fread( &msg->data[msg->len], 1, len - msg->len, f );
                if (r <= 0)