Use "git merge" instead of "git pull ."

diff --git a/line-log.c b/line-log.c
index 6f94d56063aa6d9544be4fdb41241a968f5aa347..c2d01dccc2a12a767c442de58ed78df130699d74 100644 (file)
--- a/line-log.c
+++ b/line-log.c
@@ -299,6 +299,7 @@ static void line_log_data_insert(struct line_log_data **list,
        p = xcalloc(1, sizeof(struct line_log_data));
        p->path = path;
        range_set_append(&p->ranges, begin, end);
+       sort_and_merge_range_set(&p->ranges);
        if (ip) {
                p->next = ip->next;
                ip->next = p;