diff options
| author | Junio C Hamano <gitster@pobox.com> | 2009-09-03 23:59:25 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-09-04 11:50:26 -0700 |
| commit | b8d9c1a66b99ad3ca8069add010dafdd1bc6cab8 (patch) | |
| tree | c3d604a9dd669a4207d3432c1dbfc9bcb160e44b /wt-status.h | |
| parent | 94ea026b358f9fd5395d9344a80f2d5a50e93e1f (diff) | |
| download | git-b8d9c1a66b99ad3ca8069add010dafdd1bc6cab8.tar.gz | |
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>
Diffstat (limited to 'wt-status.h')
0 files changed, 0 insertions, 0 deletions