git-for-windows/git
1
0
Fork 0
mirror of https://github.com/git-for-windows/git.git synced 2026-03-25 19:43:19 -05:00
Code Issues Packages Projects Releases 335 Wiki Activity
Files
449bb2e94de48dcbe8a068397fb5c443d50de882
git/merge-recursive.c
Stefan Beller c2d4b4cd06 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>
2017-06-30 10:56:37 -07:00

61 KiB
Raw Blame History

View Raw
Reference in New Issue View Git Blame Copy Permalink