Locally git handled the file name change. I think moz-phab or mercurial does not handle file name changes in the same way? Trying this without moz-phab to see if it will merge cleanly this way. If that doesn't work I'll advice on next steps.
Bug 1877197 Comment 9 Edit History
Note: The actual edited comment in the bug view page will always show the original commenter’s name and original timestamp.
Locally git handled the file name change. I think moz-phab or mercurial does not handle file name changes in the same way? Trying this without moz-phab to see if it will merge cleanly this way. If that doesn't work I'll need advice on next steps.