From: Finn Arne Gangstad <finnag@pvv.org>
Date: Tue, 18 Dec 2007 19:50:28 +0000 (+0100)
Subject: Improved submodule merge support
X-Git-Tag: v1.5.4-rc1~3
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/20b178de7b20a0ebf02b8da3b4791c06fc8e3a63?ds=inline;hp=20b178de7b20a0ebf02b8da3b4791c06fc8e3a63

Improved submodule merge support

When merging conflicting submodule changes from a supermodule, generate
a conflict message saying what went wrong. Also leave the tree in a state
where git status shows the conflict, and git submodule status gives the user
enough information to do the merge manally. Previously this would just fail.

Signed-off-by: Finn Arne Gangstad <finnag@pvv.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---