Kristoffer Haugsbakk <code@xxxxxxxxxxxxxxx> writes:
> - NEWTREE=$(git merge-tree --write-tree $BRANCH1 $BRANCH2)
> - test $? -eq 0 || die "There were conflicts..."
> + NEWTREE=$(git merge-tree --write-tree $BRANCH1 $BRANCH2) || {
> + echo "There were conflicts..." 1>&2
> + exit 1
> + }
Makes sense. Was there a particular reason why these two patches
had to be done in two separate steps?
Looking good otherwise. Thanks.
