Merge recreating deleted file

[Koritako Alana]

On Sat, 13 Oct 2018 at 20:25, James Reynolds <eire1130 at gmail.com> wrote:

> I havent looked at the repo, so it's possible your TLDR missed it, butYou
> need to commit merges. If you merged through command line and not some
> other tool, you should have received a "dont forget to commit" msssage.
>

Hi James,

Thanks for the reply. That isn't really the problem I'm trying to address,
but I can see how one might think that is the problem from the TLDR.
My concern is that if I did the commit, it would not be an empty commit.
This is surprising to me, I was expecting an empty merge commit.

Keep well,
Koritako
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.mercurial-scm.org/pipermail/mercurial/attachments/20181014/fc4794cd/attachment-0002.html>