diff options
Diffstat (limited to 'diffcore.h')
| -rw-r--r-- | diffcore.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/diffcore.h b/diffcore.h index 7b1cd4a059..c709cddc42 100644 --- a/diffcore.h +++ b/diffcore.h @@ -47,6 +47,7 @@ struct diff_filepair { * certain ordering of patches that later * diffcore transformations should not break. */ + int status; /* M C R N D U (see Documentation/diff-format.txt) */ }; #define DIFF_PAIR_UNMERGED(p) \ (!DIFF_FILE_VALID((p)->one) && !DIFF_FILE_VALID((p)->two)) |