Junio C Hamano 0c44c94309 merge-recursive: do not die on a conflicting submodule ...

We cannot represent the 3-way conflicted state in the work tree
for these entries, but it is normal not to have commit objects
for them in our repository.  Just update the index and the life
will be good.

Signed-off-by: Junio C Hamano <gitster@pobox.com>

2009-04-29 16:50:21 -07:00

37 KiB

Raw Blame History

View Raw