HomePhabricator

merge: additional test cases to show merge-halting behavior

Authored by ryanmce.

Description

merge: additional test cases to show merge-halting behavior

In the previous patches, we allowed the user to specify that
a merge process should be halted when a filemerge fails.

This patch adds tests that show additional places this logic
can be utilized -- via the options to do additional post-filemerge
checks to determine if a file merge was successful.

Differential Revision: https://phab.mercurial-scm.org/D952

Details

Committed
ryanmceOct 6 2017, 9:48 AM
Differential Revision
D952: merge: additional test cases to show merge-halting behavior
Parents
rHGc858afe9c59b: rebase: add support to output nodechanges
Branches
Unknown
Tags
Unknown