![[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) | ||
| commit | bd6a9e885aec97999041307b76d73de4605f25db | |
| tree | 0281c7e9958d9144c5ee0d66bd57debfaa2d7323 | tree | snapshot |
| parent | 0509ef3d211a94658d68705bb852b7f94a3ac684 | commit | diff |
| parent | 0a798076b8d1a4a31bf2b24c564e2a99fd1c43a1 | commit | diff |
Merge branch 'lt/diff-tree'
* lt/diff-tree:
combine-diff: move formatting logic to show_combined_diff()
combined-diff: use diffcore before intersecting paths.
diff-tree -c raw output
* lt/diff-tree:
combine-diff: move formatting logic to show_combined_diff()
combined-diff: use diffcore before intersecting paths.
diff-tree -c raw output
| diff-files.c | diff1 | | diff2 | | blob | history |