From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 08 Oct 2024 20:44:21 GMT
Subject: Re: [PATCH v2 2/2] doc: merge-tree: use || directly
Message-ID: <xmqqjzeiz5ne.fsf@gitster.g>
In-Reply-To: <13e0f3bed5dd894ee692c672b301697e0a909e04.1728413450.git.code@khaugsbakk.name>

Kristoffer Haugsbakk <code@khaugsbakk.name> 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.