Andrew's git
/
gitweb.git
/ blobdiff
summary
|
log
|
commit
|
diff
|
tree
commit
grep
author
committer
pickaxe
?
re
Use hashcpy() when copying object names
[gitweb.git]
/
diffcore.h
diff --git
a/diffcore.h
b/diffcore.h
index cbe9e62b49aa56f964817b60fa3d625959e492dc..92788ee4de8e59068a204729a8d6f7f89aaa6ee6 100644
(file)
--- a/
diffcore.h
+++ b/
diffcore.h
@@
-68,6
+68,8
@@
struct diff_filepair {
unsigned broken_pair : 1;
unsigned renamed_pair : 1;
unsigned is_unmerged : 1;
+ unsigned done_skip_stat_unmatch : 1;
+ unsigned skip_stat_unmatch_result : 1;
};
#define DIFF_PAIR_UNMERGED(p) ((p)->is_unmerged)