D930: merge: add tests to show current behavior on failed filemerges

ryanmce (Ryan McElroy) phabricator at mercurial-scm.org
Fri Oct 6 06:48:01 EDT 2017


ryanmce added inline comments.

INLINE COMMENTS

> quark wrote in test-merge-halt.t:32
> Should we have an `hg resolve -l` here?

sounds good

> quark wrote in test-merge-halt.t:36
> 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".

I like the suggestion. Will follow.

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