![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Junio C Hamano <junkio@cox.net> | |
| Fri, 10 Feb 2006 05:10:52 +0000 (21:10 -0800) | ||
| committer | Junio C Hamano <junkio@cox.net> | |
| Fri, 10 Feb 2006 05:10:52 +0000 (21:10 -0800) |
* lt/diff-tree:
combine-diff: move formatting logic to show_combined_diff()
combined-diff: use diffcore before intersecting paths.
diff-tree -c raw output
combine-diff: move formatting logic to show_combined_diff()
combined-diff: use diffcore before intersecting paths.
diff-tree -c raw output
| 1 | 2 | |||
|---|---|---|---|---|
| diff-files.c | patch | | diff1 | | diff2 | | blob | history |
diff --cc diff-files.c
Simple merge