summaryrefslogtreecommitdiff
path: root/diff.h
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2006-01-28 08:03:38 (GMT)
committerJunio C Hamano <junkio@cox.net>2006-01-28 08:08:29 (GMT)
commitea726d02e9677a66586d7ffebe97f112ab6dab33 (patch)
treed2248253c5d6b025cbd5dbfabbecf19788f2bc10 /diff.h
parent3ec1909fdaa1189a8f9d23f84e33b45d9d7600cd (diff)
downloadgit-ea726d02e9677a66586d7ffebe97f112ab6dab33.zip
git-ea726d02e9677a66586d7ffebe97f112ab6dab33.tar.gz
git-ea726d02e9677a66586d7ffebe97f112ab6dab33.tar.bz2
diff-files: -c and --cc options.
This ports the "combined diff" to diff-files so that differences to the working tree files since stage 2 and stage 3 are shown the same way as combined diff output from diff-tree for the merge commit would be shown if the current working tree files are committed. Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'diff.h')
-rw-r--r--diff.h11
1 files changed, 11 insertions, 0 deletions
diff --git a/diff.h b/diff.h
index ab0d47b..539bd2f 100644
--- a/diff.h
+++ b/diff.h
@@ -56,6 +56,17 @@ extern int diff_tree(struct tree_desc *t1, struct tree_desc *t2,
extern int diff_tree_sha1(const unsigned char *old, const unsigned char *new,
const char *base, struct diff_options *opt);
+struct combine_diff_path {
+ struct combine_diff_path *next;
+ int len;
+ char *path;
+ unsigned char sha1[20];
+ unsigned char parent_sha1[FLEX_ARRAY][20];
+};
+
+int show_combined_diff(struct combine_diff_path *elem, int num_parent,
+ int dense, const char *header, int show_empty);
+
extern int diff_tree_combined_merge(const unsigned char *sha1, const char *, int, int);
extern void diff_addremove(struct diff_options *,