svn commit: r362681 - in head: contrib/bc contrib/bc/gen contrib/bc/include contrib/bc/locales contrib/bc/manuals contrib/bc/src contrib/bc/src/bc contrib/bc/src/dc contrib/bc/src/history contrib/b...

[Ed Maste]

On Mon, 29 Jun 2020 at 11:27, John Baldwin <jhb at freebsd.org> wrote:
>
> I suspect just doing the 'merge --record-only' is the simplest method
> assuming Git handles it ok.  I suspect since Git ignores mergeinfo this
> is fine, but it would be good for Ed to confirm.  You can always restore
> the tests in the future in contrib/bc when you want to add them.

I think a --record-only merge is the best approach; in any case we
have a number of these in the tree already and Git will have to deal
with them.