pull: check if in unresolved merge state

diff --git a/line-log.c b/line-log.c
index a9ce0147b7edf698518a88372bb138cbc47aeb1d..a5ed9e3642271afd69a0434876515b97aaceb657 100644 (file)
--- a/line-log.c
+++ b/line-log.c
@@ -1099,6 +1099,7 @@ static int process_all_files(struct line_log_data **range_out,
                        rg->pair = diff_filepair_dup(queue->queue[i]);
                        memcpy(&rg->diff, pairdiff, sizeof(struct diff_ranges));
                }
+               free(pairdiff);
        }
 
        return changed;