| Wed, 08 Oct 2014 21:07:30 -0700 |
Martin von Zweigbergk |
test-resolve: add test resolving one of two files
|
| Wed, 08 Oct 2014 21:19:31 -0700 |
Martin von Zweigbergk |
test-resolve: clarify test descriptions and consistently use "should"
|
| Sat, 26 Jul 2014 03:32:49 +0200 |
Pierre-Yves David |
resolve: add parenthesis around "no more unresolved files" message
stable
|
| Mon, 09 Jun 2014 14:11:17 -0500 |
Matt Mackall |
resolve: fix grammar of no matching files message
|
| Fri, 23 May 2014 13:10:31 -0700 |
Siddharth Agarwal |
resolve: don't abort resolve -l even when no merge is in progress
|
| 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, 18 Apr 2014 18:56:26 -0700 |
Gregory Szorc |
resolve: print warning when no work performed (issue4208)
|
| Fri, 18 Apr 2014 19:08:32 -0700 |
Gregory Szorc |
resolve: abort when not applicable (BC)
|
| Fri, 18 Apr 2014 18:26:42 -0700 |
Gregory Szorc |
resolve: split test
|
| Mon, 11 Jun 2012 01:40:51 +0200 |
Mads Kiilerich |
tests: add missing trailing 'cd ..'
|
| Tue, 19 Oct 2010 22:33:52 -0500 |
Steve Borho |
merge: implement --tool arguments using new ui.forcemerge configurable
|
| 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'
|
| Mon, 30 Aug 2010 14:06:18 +0900 |
Nicolas Dumazet |
tests: unify test-resolve
base
tests/test-resolve@09ba722b4f14
|
