| Tue, 06 Oct 2020 22:36:15 -0700 |
Martin von Zweigbergk |
errors: introduce InputError and use it from commands and cmdutil
|
| Mon, 08 Jan 2018 19:41:47 +0530 |
Pulkit Goyal |
merge: add `--abort` flag which can abort the merge
|
| Sun, 11 Oct 2015 21:56:39 -0700 |
Siddharth Agarwal |
merge.mergestate: perform all premerges before any merges (BC)
|
| Fri, 09 Oct 2015 13:54:52 -0700 |
Siddharth Agarwal |
simplemerge: move conflict warning message to filemerge
|
| Fri, 25 Sep 2015 03:51:46 -0400 |
timeless |
resolve: consistently describe re-merge + unresolved
|
| Thu, 24 Jul 2014 14:29:08 -0700 |
Nathan Goldbaum |
resolve: report no argument warning using a hint
stable
|
| Mon, 11 Jun 2012 01:40:51 +0200 |
Mads Kiilerich |
tests: add missing trailing 'cd ..'
|
| Wed, 16 Nov 2011 18:04:19 -0600 |
Matt Mackall |
merge: give a special message for internal:merge failure (issue3105)
|
| Mon, 20 Sep 2010 16:00:15 -0500 |
Matt Mackall |
tests: drop final true command from unified tests
|
| Thu, 16 Sep 2010 17:51:32 -0500 |
Matt Mackall |
tests: add exit codes to unified tests
|
| Sun, 12 Sep 2010 18:05:53 -0500 |
Brodie Rao |
merge: suggest 'hg up -C .' for discarding changes, not 'hg up -C'
|
| Wed, 18 Aug 2010 06:02:08 +0530 |
Pradeepkumar Gayam |
tests: unify test-merge9
base
tests/test-merge9@cfc8e6140928
|
