submodule.c: move submodule merging to merge-recursive.c
authorStefan Beller <sbeller@google.com>
Tue, 15 May 2018 20:00:28 +0000 (13:00 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 16 May 2018 01:08:43 +0000 (10:08 +0900)
commit18cfc08...6617e28fb6d29d579bec0ffcdb439196
tree70f603f...3147672e2a41e3dd4f82f66d3bb80e58copy hash to clipboard (tree)
parentccdcbd5...c4475c2238b310f7113ab3075b5abc9ccopy hash to clipboard (diff)
merge-recursive.c
submodule.c
submodule.h