Mercurial > hg
log tests/test-merge-halt.t @ 40397:36b134c436b8
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 |