| 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 ..'
|
| Wed, 16 Nov 2011 18:04:19 -0600 |
Matt Mackall |
merge: give a special message for internal:merge failure (issue3105)
|
| Sun, 06 Mar 2011 15:21:50 +0100 |
Patrick Mezard |
Improve unresolved merge conflicts warning (issue2681)
stable
|
| Fri, 17 Sep 2010 17:03:04 -0500 |
Matt Mackall |
tests: exit 0 no longer needed on 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'
|
| Thu, 12 Aug 2010 22:28:21 +0900 |
Nicolas Dumazet |
tests: unify test-commit-unresolved
base
tests/test-commit-unresolved@4b077f714900
|
