From: "Todd C. Miller" <Todd.Miller@sudo.ws>
Subject: Re: make 'got update' skip conflicted files?
To: Stefan Sperling <stsp@stsp.name>
Cc: gameoftrees@openbsd.org
Date: Sat, 18 Apr 2020 10:04:24 -0600

Looks good to me.  I guess no callers check for rebase_status ==
GOT_STATUS_MERGE.

 - todd