X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=diffcore.h;h=1ea80671e30500f95fc1b648ccc6d5143ac0ac52;hb=d54fe394acbad36e9d0fd960d5e10f2769a8041b;hp=2249bc2c05744ce5026744547fcb30195a19b3f1;hpb=6295ac347acab0f100bc143effd28d3b0bbff739;p=git.git

diff --git a/diffcore.h b/diffcore.h
index 2249bc2c0..1ea80671e 100644
--- a/diffcore.h
+++ b/diffcore.h
@@ -54,9 +54,9 @@ struct diff_filepair {
 	unsigned source_stays : 1; /* all of R/C are copies */
 	unsigned broken_pair : 1;
 	unsigned renamed_pair : 1;
+	unsigned is_unmerged : 1;
 };
-#define DIFF_PAIR_UNMERGED(p) \
-	(!DIFF_FILE_VALID((p)->one) && !DIFF_FILE_VALID((p)->two))
+#define DIFF_PAIR_UNMERGED(p) ((p)->is_unmerged)
 
 #define DIFF_PAIR_RENAME(p) ((p)->renamed_pair)