| commit | 2f4bcd8b70041627abdf7811acb67cc8e7bee574 | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Fri, 7 Jul 2017 01:14:45 +0000 (6 18:14 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Fri, 7 Jul 2017 01:14:45 +0000 (6 18:14 -0700) | ||
| tree | 80bd799401fe27f0f65f9d1babbad11dbd63fe18 | treesnapshot (tar.gz zip) |
| parent | f9b3252b2a4b3dbaa9f8434cdd2b8fd3013519f1 | commitdiff |
| parent | c2d4b4cd06f19e89ad242c2de542821edc01c01f | commitdiff |
Merge branch 'sb/merge-recursive-code-cleanup'
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
| merge-recursive.c | diff1 | diff2 | blobhistory |