Subject: Re: [PATCH v2 2/2] doc: merge-tree: use || directly

From: Junio C Hamano <[email-masked]>
Date: Tue, 08 Oct 2024 13:44:21 -0700

Kristoffer Haugsbakk <[email-masked]> 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.