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
mbthomas accepted this revision.
mbthomas added a comment.
Stack all looks good to me.
REPOSITORY
rHG Mercurial
REVISION DETAIL
https://phab.mercurial-scm.org/D953
To: ryanmce, #hg-reviewers, mbthomas
Cc: mbthomas, mercurial-devel
___
Mercurial
ryanmce created this revision.
Herald added a subscriber: mercurial-devel.
Herald added a reviewer: hg-reviewers.
REVISION SUMMARY
Depends on https://phab.mercurial-scm.org/D952.
This allows the user to halt the merge if conflict markers or no changes are
found in the merged file as well.
