Mercurial > hg
log tests/test-resolve.t @ 49293:e3143ab9dadb
| age | author | description |
|---|---|---|
| Thu, 02 Dec 2021 22:59:36 -0800 | Martin von Zweigbergk | mergestate: merge `preresolve()` into `resolve()` |
| Wed, 10 Mar 2021 13:14:32 +0530 | Pulkit Goyal | commit: get info from mergestate whether a file was merged or not |
| Fri, 29 Jan 2021 15:56:08 -0800 | Martin von Zweigbergk | errors: use StateError more in merge module |
| Tue, 19 Jan 2021 14:00:42 -0800 | Martin von Zweigbergk | resolve: also detect new :mergediff conflict markers |
| Thu, 22 Oct 2020 14:14:59 -0700 | Martin von Zweigbergk | errors: introduce CanceledError and use it in a few places |
| Mon, 12 Oct 2020 12:44:18 -0700 | Martin von Zweigbergk | errors: introduce StateError and use it from commands and cmdutil |
| Tue, 06 Oct 2020 22:36:15 -0700 | Martin von Zweigbergk | errors: introduce InputError and use it from commands and cmdutil |