From: Josiah Frentsos <jfrent@tilde.team>
Subject: Re: merge chokes, creates bogus conflicts
To: gameoftrees@openbsd.org
Date: Sat, 18 Feb 2023 09:12:02 -0500

On Sun, Feb 19, 2023 at 12:34:49AM +1100, Mark Jamsek wrote:
> blob - bb1825eecded3623bbabcf0541bce55367696327
> blob + 3018e9193697fa4789c04d11e99299a0740c241e
> --- got/got.1
> +++ got/got.1
> @@ -1654,6 +1654,7 @@ is a directory.
>  .Cm commit
>  .Op Fl NnS
>  .Op Fl A Ar author
> +.Op Fl C

This should be grouped with 'NnS'.

>  .Op Fl F Ar path
>  .Op Fl m Ar message
>  .Op Ar path ...