Mercurial > hg
log tests/test-merge-halt.t @ 48393:1a8a70b4b0ad
age | author | description |
---|---|---|
Tue, 19 Oct 2021 16:14:53 -0700 | Kyle Lippincott | merge-halt: fix issue with merge.on-failure=halt breaking unshelve stable |
Tue, 19 Oct 2021 16:14:46 -0700 | Kyle Lippincott | merge-halt: demonstrate unshelve issue with merge.on-failure=halt stable |
Wed, 21 Oct 2020 19:00:16 -0700 | Martin von Zweigbergk | errors: add config that lets user get more detailed exit codes |
Mon, 13 Jul 2020 16:42:44 -0700 | Daniel Ploch | error: unify the error message formats for 'rebase' and 'unshelve' |
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 |