Mercurial
Mercurial
>
hg-stable
/ file revisions
summary
|
shortlog
|
changelog
|
graph
|
tags
|
bookmarks
|
branches
|
file
| revisions |
annotate
|
diff
|
comparison
|
rss
|
help
(0)
tip
Find changesets by keywords (author, files, the commit message), revision number or hash, or
revset expression
.
tests/test-merge-halt.t
Thu, 02 Dec 2021 22:59:36 -0800
Martin von Zweigbergk
mergestate: merge `preresolve()` into `resolve()`
file
|
diff
|
annotate
Tue, 19 Oct 2021 16:14:53 -0700
Kyle Lippincott
merge-halt: fix issue with merge.on-failure=halt breaking unshelve
stable
file
|
diff
|
annotate
Tue, 19 Oct 2021 16:14:46 -0700
Kyle Lippincott
merge-halt: demonstrate unshelve issue with merge.on-failure=halt
stable
file
|
diff
|
annotate
Wed, 21 Oct 2020 19:00:16 -0700
Martin von Zweigbergk
errors: add config that lets user get more detailed exit codes
file
|
diff
|
annotate
Mon, 13 Jul 2020 16:42:44 -0700
Daniel Ploch
error: unify the error message formats for 'rebase' and 'unshelve'
file
|
diff
|
annotate
Fri, 06 Oct 2017 06:48:43 -0700
Ryan McElroy
merge: additional test cases to show merge-halting behavior
file
|
diff
|
annotate
Fri, 06 Oct 2017 06:48:43 -0700
Ryan McElroy
merge: allow user to halt merge on merge-tool failures
file
|
diff
|
annotate
Fri, 06 Oct 2017 06:48:43 -0700
Ryan McElroy
merge: add tests to show current behavior on failed filemerges
file
|
diff
|
annotate
less
more
(0)
tip