Merge branch 'es/blame-L-breakage'

diff --git a/line-log.c b/line-log.c
index 4bbb09be59e561b519f63c3685fb790de9e70ded..8cc29a0000f8456331457c0d247c242f3113517e 100644 (file)
--- a/line-log.c
+++ b/line-log.c
@@ -116,7 +116,8 @@ static void sort_and_merge_range_set(struct range_set *rs)
 
        for (i = 1; i < rs->nr; i++) {
                if (rs->ranges[i].start <= rs->ranges[o-1].end) {
-                       rs->ranges[o-1].end = rs->ranges[i].end;
+                       if (rs->ranges[o-1].end < rs->ranges[i].end)
+                               rs->ranges[o-1].end = rs->ranges[i].end;
                } else {
                        rs->ranges[o].start = rs->ranges[i].start;
                        rs->ranges[o].end = rs->ranges[i].end;