| commit | 4aaf5b0b21ac1fc294066593ac5243b3eaff897b | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Mon, 10 Jul 2017 20:59:09 +0000 (10 13:59 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Mon, 10 Jul 2017 20:59:09 +0000 (10 13:59 -0700) | ||
| tree | 7285c1c971b3881c51e9cd05786bdae654342666 | treesnapshot (tar.gz zip) |
| parent | 127c13aa41bdf3115561ae6e52313cfa278c35da | commitdiff |
| parent | c2d4b4cd06f19e89ad242c2de542821edc01c01f | commitdiff |
Merge branch 'sb/merge-recursive-code-cleanup' into maint
Code clean-up.
* sb/merge-recursive-code-cleanup:
merge-recursive: use DIFF_XDL_SET macro
Code clean-up.
* sb/merge-recursive-code-cleanup:
merge-recursive: use DIFF_XDL_SET macro