merge-recursive: match the unmerged index entry behaviour with merge-resolve

[thirdparty/git.git] / diffcore-break.c

diff --git a/diffcore-break.c b/diffcore-break.c
index b0c8461e1243328795258f0fd7d12f509403403c..06f9a7f0ee25891ff6f4dd9646e39cd4c8b105fd 100644 (file)
--- a/diffcore-break.c
+++ b/diffcore-break.c
@@ -231,8 +231,8 @@ static void merge_broken(struct diff_filepair *p,
 
        dp = diff_queue(outq, d->one, c->two);
        dp->score = p->score;
-       diff_free_filespec(d->two);
-       diff_free_filespec(c->one);
+       diff_free_filespec_data(d->two);
+       diff_free_filespec_data(c->one);
        free(d);
        free(c);
 }