D953: merge: use filemerge failure handler in post-filemerge checks checks

[ryanmce (Ryan McElroy)]

ryanmce abandoned this revision.
ryanmce added a comment.


  It turns out this isn't needed -- setting the return to 1 means we catch the failure in the generic handler I added earlier. I fixed up the tests in the previous patch to include the important test changes from here (ie, more testing of the prompt stuff).

REPOSITORY
  rHG Mercurial

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

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