| commit | c2d4b4cd06f19e89ad242c2de542821edc01c01f | |
| author | Stefan Beller <sbeller@google.com> | |
| Thu, 29 Jun 2017 22:19:32 +0000 (29 15:19 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Fri, 30 Jun 2017 17:56:37 +0000 (30 10:56 -0700) | ||
| tree | af3b299b8d8cc7f8ca34b471c9e7823c7e795b55 | treesnapshot (tar.gz zip) |
| parent | 8c8e978f5719c6a58fb998742207bf907f963143 | commitdiff |
merge-recursive: use DIFF_XDL_SET macro
Instead of implementing this on our own, just use a convenience macro.
Signed-off-by: Stefan Beller <sbeller@google.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Instead of implementing this on our own, just use a convenience macro.
Signed-off-by: Stefan Beller <sbeller@google.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| merge-recursive.c | diffblobblamehistory |