merge-recursive: do not die on a conflicting submodule
authorJunio C Hamano <gitster@pobox.com>
Wed, 29 Apr 2009 18:08:18 +0000 (11:08 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 29 Apr 2009 23:50:21 +0000 (16:50 -0700)
commit0c44c94...09693d0582e91a6744edc2e8eba46ef8
tree478bfc7...d76c4c9432018ddc686eb121eb418c96copy hash to clipboard (tree)
parentd212ca1...24b1a3708a3b4cb72c58b20ef442b24fcopy hash to clipboard (diff)
merge-recursive.c
t/t7405-submodule-merge.sh