This maybe does all the hard work for you ...
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
git merge-recursive "$(pretty_tree "refs/top-bases/$_dep")" -- HEAD "$(pretty_tree "refs/heads/$_dep")" || retmerge="$?";
if test "x$retmerge" != "x0"; then
git merge-recursive "$(pretty_tree "refs/top-bases/$_dep")" -- HEAD "$(pretty_tree "refs/heads/$_dep")" || retmerge="$?";
if test "x$retmerge" != "x0"; then
echo "fix up the merge and update the index. Don't commit!"
#todo error handling
sh -i </dev/tty;
echo "fix up the merge and update the index. Don't commit!"
#todo error handling
sh -i </dev/tty;