![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Junio C Hamano <junkio@cox.net> | |
| Sat, 28 Jan 2006 08:03:38 +0000 (00:03 -0800) | ||
| committer | Junio C Hamano <junkio@cox.net> | |
| Sat, 28 Jan 2006 08:08:29 +0000 (00:08 -0800) | ||
| commit | ea726d02e9677a66586d7ffebe97f112ab6dab33 | |
| tree | d2248253c5d6b025cbd5dbfabbecf19788f2bc10 | tree | snapshot |
| parent | 3ec1909fdaa1189a8f9d23f84e33b45d9d7600cd | commit | 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>
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 | blob | history | |
| diff-files.c | diff | blob | history | |
| diff.h | diff | blob | history |