diff-files: -c and --cc options.
commitea726d02e9677a66586d7ffebe97f112ab6dab33
authorJunio C Hamano <junkio@cox.net>
Sat, 28 Jan 2006 08:03:38 +0000 (28 00:03 -0800)
committerJunio C Hamano <junkio@cox.net>
Sat, 28 Jan 2006 08:08:29 +0000 (28 00:08 -0800)
treed2248253c5d6b025cbd5dbfabbecf19788f2bc10
parent3ec1909fdaa1189a8f9d23f84e33b45d9d7600cd
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>
combine-diff.c
diff-files.c
diff.h