Mercurial > hg
log tests/test-commit-unresolved.t @ 51242:2e2832e00f6c
| age | author | description |
|---|---|---|
| Mon, 23 Nov 2020 16:48:13 -0800 | Martin von Zweigbergk | errors: raise StateError when there are unresolves merge conflicts |
| 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 |
| Fri, 24 Jan 2020 15:07:44 -0800 | Martin von Zweigbergk | merge: use check_incompatible_arguments() for --abort |
| Sun, 30 Jun 2019 01:07:14 +0530 | Taapas Agrawal | abort: added support for merge |
| Mon, 08 Jan 2018 19:41:47 +0530 | Pulkit Goyal | merge: add `--abort` flag which can abort the merge |
| Tue, 20 Sep 2016 23:48:08 +0000 | timeless | localrepo: use single quotes in use warning |