Junio C Hamano ea726d02e9 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>

2006-01-28 00:08:29 -08:00

16 KiB

Raw Blame History

View Raw