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

[martinvonz (Martin von Zweigbergk)]

martinvonz added a comment.


  I'll insert another patch with another fun test case before this patch soon

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
Cc: marmoute, mercurial-devel