Mercurial > hg
log tests/test-merge-default.t @ 30388:8819b63732b9
age | author | description |
---|---|---|
Mon, 08 Feb 2016 19:32:29 +0100 | Pierre-Yves David | destutil: allow to specify an explicit source for the merge |
Mon, 08 Feb 2016 14:55:58 +0100 | Pierre-Yves David | merge: give priority to "not at head" failures for bare 'hg merge' |
Tue, 02 Feb 2016 14:49:02 +0000 | Pierre-Yves David | update: warn about other topological heads on bare update |
Thu, 15 Oct 2015 01:47:28 +0100 | Pierre-Yves David | revset: rename and test '_destmerge' |
Tue, 19 Aug 2014 01:13:10 +0200 | Mads Kiilerich | comments: describe ancestor consistently - avoid 'least common ancestor' |
Thu, 08 Dec 2011 16:01:44 -0600 | Matt Mackall | merge with stable |
Wed, 07 Dec 2011 11:23:01 -0600 | Kevin Bullock | merge: make 'nothing to merge' aborts consistent |