| Mon, 08 Feb 2016 19:32:29 +0100 |
Pierre-Yves David |
destutil: allow to specify an explicit source for the merge
|
file |
diff |
annotate
|
| Mon, 08 Feb 2016 14:55:58 +0100 |
Pierre-Yves David |
merge: give priority to "not at head" failures for bare 'hg merge'
|
file |
diff |
annotate
|
| Tue, 02 Feb 2016 14:49:02 +0000 |
Pierre-Yves David |
update: warn about other topological heads on bare update
|
file |
diff |
annotate
|
| Thu, 15 Oct 2015 01:47:28 +0100 |
Pierre-Yves David |
revset: rename and test '_destmerge'
|
file |
diff |
annotate
|
| Tue, 19 Aug 2014 01:13:10 +0200 |
Mads Kiilerich |
comments: describe ancestor consistently - avoid 'least common ancestor'
|
file |
diff |
annotate
|
| Thu, 08 Dec 2011 16:01:44 -0600 |
Matt Mackall |
merge with stable
|
file |
diff |
annotate
|
| Wed, 07 Dec 2011 11:23:01 -0600 |
Kevin Bullock |
merge: make 'nothing to merge' aborts consistent
|
file |
diff |
annotate
|
| Thu, 08 Dec 2011 14:32:44 -0600 |
Matt Mackall |
branch: warn on branching
stable
|
file |
diff |
annotate
|
| Thu, 16 Sep 2010 17:51:32 -0500 |
Matt Mackall |
tests: add exit codes to unified tests
|
file |
diff |
annotate
|
| Sat, 11 Sep 2010 11:44:53 +0200 |
Adrian Buehlmann |
tests: unify test-merge-default
|
file |
diff |
annotate
| base
|