Merge branch 'mk/combine-diff-context-horizon-fix' into maint

diff --git a/combine-diff.c b/combine-diff.c
index 77d7872aafe659045e9ec228de97e87c9cea00a1..3e8bb17831aa5f2f39ee3a07eeebdda90ae39556 100644 (file)
--- a/combine-diff.c
+++ b/combine-diff.c
@@ -518,8 +518,11 @@ static int give_context(struct sline *sline, unsigned long cnt, int num_parent)
                unsigned long k;
 
                /* Paint a few lines before the first interesting line. */
-               while (j < i)
-                       sline[j++].flag |= mark | no_pre_delete;
+               while (j < i) {
+                       if (!(sline[j].flag & mark))
+                               sline[j].flag |= no_pre_delete;
+                       sline[j++].flag |= mark;
+               }
 
        again:
                /* we know up to i is to be included.  where does the