| Sat, 26 Jul 2014 03:32:49 +0200 |
Pierre-Yves David |
resolve: add parenthesis around "no more unresolved files" message
stable
|
file |
diff |
annotate
|
| Mon, 26 May 2014 11:44:58 -0700 |
Pierre-Yves David |
merge: drop the quotes around commit description
|
file |
diff |
annotate
|
| Thu, 08 May 2014 16:50:22 -0700 |
Durham Goode |
merge: add conflict marker formatter (BC)
|
file |
diff |
annotate
|
| Tue, 22 Apr 2014 02:10:25 +0200 |
Mads Kiilerich |
merge: change debug logging - test output changes but no real changes
|
file |
diff |
annotate
|
| Fri, 09 May 2014 14:46:50 -0500 |
Matt Mackall |
resolve: simplify "finished" message
|
file |
diff |
annotate
|
| Fri, 18 Apr 2014 22:19:25 -0700 |
Gregory Szorc |
resolve: print message when no unresolved files remain (issue4214)
|
file |
diff |
annotate
|
| Fri, 08 Feb 2013 15:23:23 +0000 |
Siddharth Agarwal |
manifestmerge: pass in branchmerge and force separately
|
file |
diff |
annotate
|
| Thu, 24 Jan 2013 23:57:44 +0100 |
Mads Kiilerich |
merge: delay debug messages for merge actions
|
file |
diff |
annotate
|
| Wed, 11 Jul 2012 15:03:10 -0700 |
Bryan O'Sullivan |
tests: reduce spurious failures when run with generaldelta
|
file |
diff |
annotate
|
| Mon, 11 Jun 2012 01:40:51 +0200 |
Mads Kiilerich |
tests: add missing trailing 'cd ..'
|
file |
diff |
annotate
|
| Fri, 09 Dec 2011 17:34:53 +0100 |
Martin Geisler |
merge: make debug output easier to read
|
file |
diff |
annotate
|
| Wed, 16 Nov 2011 18:04:19 -0600 |
Matt Mackall |
merge: give a special message for internal:merge failure (issue3105)
|
file |
diff |
annotate
|
| Wed, 04 May 2011 13:37:41 +0200 |
Sune Foldager |
tests: fix deprecated use of hg debugdata/debugindex
|
file |
diff |
annotate
|
| Thu, 16 Sep 2010 17:51:32 -0500 |
Matt Mackall |
tests: add exit codes to unified tests
|
file |
diff |
annotate
|
| Sun, 12 Sep 2010 18:05:53 -0500 |
Brodie Rao |
merge: suggest 'hg up -C .' for discarding changes, not 'hg up -C'
|
file |
diff |
annotate
|
| Thu, 02 Sep 2010 23:22:51 +0200 |
Martin Geisler |
tests: remove unneeded -d flags
|
file |
diff |
annotate
|
| Wed, 18 Aug 2010 05:54:00 +0530 |
Pradeepkumar Gayam |
tests: unify test-merge7
|
file |
diff |
annotate
| base
|