D952: merge: additional test cases to show changing behavior

[ryanmce (Ryan McElroy)]

ryanmce added a comment.


  > https://phab.mercurial-scm.org/D953 is abandoned- should this be as well?
  
  No, but it should probably be retitled. I'll do that now.
  
  It turns out that the behavior did change, but only slightly, and not in a useful way, with the https://phab.mercurial-scm.org/D953. This still adds useful tests that show that the other ways of saying a file merge process didn't go well also can halt the merge.

REPOSITORY
  rHG Mercurial

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

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