Merge branch 'maint'

diff --git a/builtin-apply.c b/builtin-apply.c
index 9fcfe3955dcd1aaca92a812b6253a331290922fa..c0f867daed351d4b32f871941e14773a44508eaf 100644 (file)
--- a/builtin-apply.c
+++ b/builtin-apply.c
@@ -919,7 +919,7 @@ static void recount_diff(char *line, int size, struct fragment *fragment)
                        newlines++;
                        continue;
                case '\\':
-                       break;
+                       continue;
                case '@':
                        ret = size < 3 || prefixcmp(line, "@@ ");
                        break;