D930: merge: add tests to show current behavior on failed filemerges

[ryanmce (Ryan McElroy)]

ryanmce added inline comments.

INLINE COMMENTS

> krbullock wrote in test-merge-halt.t:24
> Why test this with rebase instead of merge?

That's how I roll. That being said, I'm happy to change it if people feel testing merge would provide more value.

REPOSITORY
  rHG Mercurial

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

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