update cache for conflicting submodule entries
authorClemens Buchacher <drizzd@aon.at>
Sun, 5 Apr 2009 00:46:59 +0000 (02:46 +0200)
committerJunio C Hamano <gitster@pobox.com>
Sun, 5 Apr 2009 07:26:32 +0000 (00:26 -0700)
commit0eb6574...24241b1e54be1ddff60287544faaf8d8
tree79aa4a8...f881e93d25c3d7a82efd719e97854388copy hash to clipboard (tree)
parentf37ae35...73dbc492bd3ca24badb309817ecaaa67copy hash to clipboard (diff)
merge-recursive.c
t/t7405-submodule-merge.sh