From: "Todd C. Miller" <Todd.Miller@sudo.ws>
Subject: Re: got merge -c commit progress output
To: Stefan Sperling <stsp@stsp.name>
Cc: gameoftrees@openbsd.org
Date: Mon, 27 Sep 2021 16:18:25 -0600

On Mon, 27 Sep 2021 13:30:51 +0200, Stefan Sperling wrote:

> With the change below, got merge -c displays commit progress output:
>
>   $ got merge -c
>   M  alpha
>   Merged refs/heads/newbranch into refs/heads/main: adcde1234...
>   $
>
> This looks better, and any further changes which resulted from conflict
> resolution (such as newly added files, or files deleted after the initial
> merge step) will be displayed in the output, too.

I agree that does look better.  OK millert@

 - todd