D777: merge: add merge action 'pr' to rename files during update

[mbthomas (Mark Thomas)]

mbthomas added inline comments.

INLINE COMMENTS

> mbthomas wrote in merge.py:1461
> I had tested transitive renames after update, but not before.  I'll fix it up and add a test.

Test added as `Update - local renamed file conflicts with remote directory` in https://phab.mercurial-scm.org/D786.

REPOSITORY
  rHG Mercurial

REVISION DETAIL
  https://phab.mercurial-scm.org/D777

To: mbthomas, #hg-reviewers
Cc: ryanmce, mercurial-devel