Depends on D952.
This allows the user to halt the merge if conflict markers or no changes are
found in the merged file as well.
mbthomas |
hg-reviewers |
Depends on D952.
This allows the user to halt the merge if conflict markers or no changes are
found in the merged file as well.
No Linters Available |
No Unit Test Coverage |
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).