rerere: understand "diff3 -m" style conflicts with the original

[thirdparty/git.git] / rerere.c

diff --git a/rerere.c b/rerere.c
index bf74b262f0cc232ba118d34dd7676ce67d3a1d9e..4e2c9dd5b7276acd11ddb6ffa6619962ef9f57f3 100644 (file)
--- a/rerere.c
+++ b/rerere.c
@@ -77,7 +77,7 @@ static int handle_file(const char *path,
        char buf[1024];
        int hunk_no = 0;
        enum {
-               RR_CONTEXT = 0, RR_SIDE_1, RR_SIDE_2,
+               RR_CONTEXT = 0, RR_SIDE_1, RR_SIDE_2, RR_ORIGINAL,
        } hunk = RR_CONTEXT;
        struct strbuf one, two;
        FILE *f = fopen(path, "r");
@@ -104,9 +104,13 @@ static int handle_file(const char *path,
                        if (hunk != RR_CONTEXT)
                                goto bad;
                        hunk = RR_SIDE_1;
-               } else if (!prefixcmp(buf, "=======") && isspace(buf[7])) {
+               } else if (!prefixcmp(buf, "|||||||") && isspace(buf[7])) {
                        if (hunk != RR_SIDE_1)
                                goto bad;
+                       hunk = RR_ORIGINAL;
+               } else if (!prefixcmp(buf, "=======") && isspace(buf[7])) {
+                       if (hunk != RR_SIDE_1 && hunk != RR_ORIGINAL)
+                               goto bad;
                        hunk = RR_SIDE_2;
                } else if (!prefixcmp(buf, ">>>>>>> ")) {
                        if (hunk != RR_SIDE_2)
@@ -132,6 +136,8 @@ static int handle_file(const char *path,
                        strbuf_reset(&two);
                } else if (hunk == RR_SIDE_1)
                        strbuf_addstr(&one, buf);
+               else if (hunk == RR_ORIGINAL)
+                       ; /* discard */
                else if (hunk == RR_SIDE_2)
                        strbuf_addstr(&two, buf);
                else if (out)