ryanmce added a comment.
> https://phab.mercurial-scm.org/D953 is abandoned- should this be as well?
No, but it should probably be retitled. I'll do that now.
It turns out that the behavior did change, but only slightly, and not in a
useful way, with the
durin42 added a comment.
https://phab.mercurial-scm.org/D953 is abandoned- should this be as well?
REPOSITORY
rHG Mercurial
REVISION DETAIL
https://phab.mercurial-scm.org/D952
To: ryanmce, #hg-reviewers, mbthomas
Cc: durin42, mercurial-devel
ryanmce updated this revision to Diff 2503.
CHANGES SINCE LAST UPDATE
https://phab.mercurial-scm.org/D952?vs=2455=2503
REVISION DETAIL
https://phab.mercurial-scm.org/D952
AFFECTED FILES
tests/test-merge-halt.t
CHANGE DETAILS
diff --git a/tests/test-merge-halt.t b/tests/test-merge-halt.t
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/D951.
In the next patch more cases of failed file merges will be able to halt the
merge process. Add some test
