diff options
| author | Junio C Hamano <junkio@cox.net> | 2005-05-24 01:55:33 +0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-05-24 03:23:10 +0400 |
| commit | b6d8f309d9bbd8193d9b73eb41c6fcdaa8001298 (patch) | |
| tree | 8c15995be05c108072397d41d0454d6737509f7b /diffcore.h | |
| parent | a4acb0eb140d80141ac564a09219a10c3ab76449 (diff) | |
[PATCH] diff-raw format update take #2.
This changes the diff-raw format again, following the mailing
list discussion. The new format explicitly expresses which one
is a rename and which one is a copy.
The documentation and tests are updated to match this change.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
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)) |