| commit | ea726d02e9677a66586d7ffebe97f112ab6dab33 | [log] [tgz] |
|---|---|---|
| author | Junio C Hamano <junkio@cox.net> | Sat Jan 28 00:03:38 2006 -0800 |
| committer | Junio C Hamano <junkio@cox.net> | Sat Jan 28 00:08:29 2006 -0800 |
| tree | d2248253c5d6b025cbd5dbfabbecf19788f2bc10 | |
| parent | 3ec1909fdaa1189a8f9d23f84e33b45d9d7600cd [diff] |
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>