merge-recursive: Save D/F conflict filenames instead of unlinking them

diff --git a/builtin/blame.c b/builtin/blame.c
index f6b03f750a0b69ef835caa0a2e4988f9a08abb85..41525f1ea1fff29fae56d7c8b3db41db7d928fd5 100644 (file)
--- a/builtin/blame.c
+++ b/builtin/blame.c
@@ -1377,7 +1377,7 @@ static void get_ac_line(const char *inbuf, const char *what,
        timepos = tmp;
 
        *tmp = 0;
-       while (person < tmp && *tmp != ' ')
+       while (person < tmp && !(*tmp == ' ' && tmp[1] == '<'))
                tmp--;
        if (tmp <= person)
                return;