| 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
|
| Mon, 30 Nov 2015 16:31:28 -0800 |
Siddharth Agarwal |
localrepo.commit: check all files for resolve state (issue4972)
stable
|
| Fri, 09 Oct 2015 13:54:52 -0700 |
Siddharth Agarwal |
simplemerge: move conflict warning message to filemerge
|
| Sat, 17 Jan 2015 22:01:14 -0200 |
Wagner Bruna |
messages: quote "hg help" hints consistently
|
| Sat, 26 Jul 2014 03:32:49 +0200 |
Pierre-Yves David |
resolve: add parenthesis around "no more unresolved files" message
stable
|
| Fri, 09 May 2014 14:46:50 -0500 |
Matt Mackall |
resolve: simplify "finished" message
|
| Fri, 18 Apr 2014 22:19:25 -0700 |
Gregory Szorc |
resolve: print message when no unresolved files remain (issue4214)
|
| Fri, 22 Nov 2013 19:14:17 +0100 |
Martin Geisler |
tests: don't load unnecessary graphlog extension
|
| Mon, 11 Jun 2012 01:40:51 +0200 |
Mads Kiilerich |
tests: add missing trailing 'cd ..'
|
