D930: merge: add tests to show current behavior on failed filemerges
quark (Jun Wu)
phabricator at mercurial-scm.org
Fri Oct 6 00:51:34 EDT 2017
quark added inline comments.
INLINE COMMENTS
> test-merge-halt.t:32
> + [1]
> +
> + $ hg rebase --abort
Should we have an `hg resolve -l` here?
> test-merge-halt.t:36
> +
> +Halting works on first failure
> + $ echo onfailure=halt >> $HGRCPATH
It feels a bit strange that the text says "works". Maybe use some neutral words like "Testing onfailure=continue", "Testing onfailure=halt", and "Testing onfailure=halt".
REPOSITORY
rHG Mercurial
REVISION DETAIL
https://phab.mercurial-scm.org/D930
To: ryanmce, #hg-reviewers
Cc: quark, krbullock, mercurial-devel
More information about the Mercurial-devel
mailing list