diff options
| author | Junio C Hamano <gitster@pobox.com> | 2009-04-29 20:08:18 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-04-30 01:50:21 +0200 |
| commit | 0c44c94309693d0582e91a6744edc2e8eba46ef8 (patch) | |
| tree | 478bfc7cd76c4c9432018ddc686eb121eb418c96 /daemon.c | |
| parent | git config: error when editing a repo config and not being in one (diff) | |
| download | git-0c44c94309693d0582e91a6744edc2e8eba46ef8.tar.xz git-0c44c94309693d0582e91a6744edc2e8eba46ef8.zip | |
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>
Diffstat (limited to 'daemon.c')
0 files changed, 0 insertions, 0 deletions