Mercurial > hg-stable

log tests/test-merge-halt.t @ 38678:7e4a856a4f05

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
less more | (0) tip
age author description
Fri, 06 Oct 2017 06:48:43 -0700 Ryan McElroy merge: additional test cases to show merge-halting behavior
Fri, 06 Oct 2017 06:48:43 -0700 Ryan McElroy merge: allow user to halt merge on merge-tool failures
Fri, 06 Oct 2017 06:48:43 -0700 Ryan McElroy merge: add tests to show current behavior on failed filemerges
less more | (0) tip