On Mon, Oct 7, 2024 at 4:11 AM Kristoffer Haugsbakk
<code@xxxxxxxxxxxxxxx> wrote:
>
> From: Kristoffer Haugsbakk <kristofferhaugsbakk@xxxxxxxxxxxx>
>
> From: Kristoffer Haugsbakk <code@xxxxxxxxxxxxxxx>
>
> Use `||` directly since that is more straightforward than checking the
> last exit status.
>
> Also use `echo` and `exit` since `die` is not defined.
Not defined where? It's defined in my scripts... ;-)
Just kidding; this is a good change.
> Signed-off-by: Kristoffer Haugsbakk <code@xxxxxxxxxxxxxxx>
> ---
> Documentation/git-merge-tree.txt | 6 ++++--
> 1 file changed, 4 insertions(+), 2 deletions(-)
>
> diff --git a/Documentation/git-merge-tree.txt b/Documentation/git-merge-tree.txt
> index 10f8ac7f80a..46091da022d 100644
> --- a/Documentation/git-merge-tree.txt
> +++ b/Documentation/git-merge-tree.txt
> @@ -211,8 +211,10 @@ linkgit:git-commit-tree[1], linkgit:git-write-tree[1],
> linkgit:git-update-ref[1], and linkgit:git-mktag[1]. Thus, it can be
> used as a part of a series of steps such as:
>
> - 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
> + }
Thanks.
