D952: merge: additional test cases to show changing behavior

[durin42 (Augie Fackler)]

durin42 added a comment.


  https://phab.mercurial-scm.org/D953 is abandoned-  should this be as well?

REPOSITORY
  rHG Mercurial

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

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