| Mon, 24 Nov 2014 16:16:34 -0800 |
Martin von Zweigbergk |
merge: separate out "both created" cases
|
| Tue, 22 Apr 2014 02:10:25 +0200 |
Mads Kiilerich |
merge: change debug logging - test output changes but no real changes
|
| Fri, 02 May 2014 01:09:14 +0200 |
Mads Kiilerich |
merge: change priority / ordering of merge actions
|
| Tue, 25 Feb 2014 20:29:14 +0100 |
Mads Kiilerich |
copies: when both sides made the same copy, report it as a copy
|
| Mon, 23 Sep 2013 20:50:51 -0700 |
Siddharth Agarwal |
merge: standardize error message for dirty working dir
|
| Mon, 23 Sep 2013 20:08:52 -0700 |
Siddharth Agarwal |
update: improve error message for dirty non-linear update with rev
|
| Sat, 09 Feb 2013 15:22:04 -0800 |
Bryan O'Sullivan |
tests: update test output (will be folded into parent)
|
| Fri, 08 Feb 2013 15:23:23 +0000 |
Siddharth Agarwal |
manifestmerge: pass in branchmerge and force separately
|
| Thu, 24 Jan 2013 23:57:44 +0100 |
Mads Kiilerich |
merge: delay debug messages for merge actions
|
| Mon, 11 Jun 2012 01:40:51 +0200 |
Mads Kiilerich |
tests: add missing trailing 'cd ..'
|
| Fri, 09 Dec 2011 17:34:53 +0100 |
Martin Geisler |
merge: make debug output easier to read
|
| Wed, 07 Dec 2011 11:23:01 -0600 |
Kevin Bullock |
merge: make 'nothing to merge' aborts consistent
|
| Tue, 19 Apr 2011 12:04:44 +0200 |
Martin Geisler |
tests: remove redundant mkdir
|
| Sat, 09 Oct 2010 17:02:28 -0500 |
Brodie Rao |
update: use higher level wording for "crosses branches" error
|
| Tue, 21 Sep 2010 16:00:02 -0500 |
Matt Mackall |
tests: cleanup exit code handling in unified tests
|
