Merge branch 'sb/config-write-fix'

diff --git a/diffcore-break.c b/diffcore-break.c
index 881a74f29e4f6033a2547f2558a5ad8a3eaad584..c64359f489c87910b9d41756918dacda49276004 100644 (file)
--- a/diffcore-break.c
+++ b/diffcore-break.c
@@ -73,7 +73,6 @@ static int should_break(struct diff_filespec *src,
 
        if (diffcore_count_changes(src, dst,
                                   &src->cnt_data, &dst->cnt_data,
-                                  0,
                                   &src_copied, &literal_added))
                return 0;