diff options
| author |  J. Bruce Fields <bfields@citi.umich.edu> | 2007-01-14 19:27:28 -0500 |
|---|---|---|
| committer | J. Bruce Fields <bfields@citi.umich.edu> | 2007-01-14 19:27:28 -0500 |
| commit | 67583917e9a2a85605c1123a62c8883593e7e889 (patch) | |
| tree | 06f61d2f28e321063b8e1e206a0e418bc1ba0486 /diffcore.h | |
| parent | user-manual: reindent (diff) | |
| parent | Merge branch 'jc/int' (diff) | |
| download | tgif-67583917e9a2a85605c1123a62c8883593e7e889.tar.xz | |
Merge branch 'master' of git://git.kernel.org/pub/scm/git/git
Diffstat (limited to 'diffcore.h')
| -rw-r--r-- | diffcore.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/diffcore.h b/diffcore.h index 2249bc2c05..1ea80671e3 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) |