D7974: merge: when rename was made on both sides, use ancestor as merge base

[martinvonz (Martin von Zweigbergk)]

martinvonz added a comment.


  In D7974#118492 <https://phab.mercurial-scm.org/D7974#118492>, @durin42 wrote:
  
  > This one needs rebased.
  
  Done.

REPOSITORY
  rHG Mercurial

CHANGES SINCE LAST ACTION
  https://phab.mercurial-scm.org/D7974/new/

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

To: martinvonz, #hg-reviewers, durin42
Cc: durin42, marmoute, mercurial-devel