]> git.neil.brown.name Git - git.git/commitdiff
git / git.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: f9b3252 c2d4b4c)
Merge branch 'sb/merge-recursive-code-cleanup'
authorJunio C Hamano <gitster@pobox.com>
Fri, 7 Jul 2017 01:14:45 +0000 (18:14 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 7 Jul 2017 01:14:45 +0000 (18:14 -0700)
Code clean-up.

* sb/merge-recursive-code-cleanup:
  merge-recursive: use DIFF_XDL_SET macro

1  2 
merge-recursive.c patch | diff1 | diff2 | blob | history

diff --cc merge-recursive.c
Simple merge
Unnamed repository; edit this file 'description' to name the repository.