| commit | b8d9c1a66b99ad3ca8069add010dafdd1bc6cab8 | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Fri, 4 Sep 2009 06:59:25 +0000 (3 23:59 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Fri, 4 Sep 2009 18:50:26 +0000 (4 11:50 -0700) | ||
| tree | c3d604a9dd669a4207d3432c1dbfc9bcb160e44b | treesnapshot (tar.gz zip) |
| parent | 94ea026b358f9fd5395d9344a80f2d5a50e93e1f | commitdiff |
diff.c: the builtin_diff() deals with only two-file comparison
The combined diff is implemented in combine_diff() and fn_out_consume()
codepath never has to deal with anything but two-file comparision.
Drop nparents from the emit_callback structure and simplify the code.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
The combined diff is implemented in combine_diff() and fn_out_consume()
codepath never has to deal with anything but two-file comparision.
Drop nparents from the emit_callback structure and simplify the code.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| diff.c | diffblobblamehistory |