From b6d8f309d9bbd8193d9b73eb41c6fcdaa8001298 Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Mon, 23 May 2005 14:55:33 -0700 Subject: [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 Signed-off-by: Linus Torvalds --- diffcore.h | 1 + 1 file changed, 1 insertion(+) (limited to 'diffcore.h') 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)) -- cgit v1.2.1