log tests/test-merge-default.t @ 49352:0cc5f74ff7f0 stable 6.1.4

age author description
Tue, 06 Oct 2020 22:36:15 -0700 Martin von Zweigbergk errors: introduce InputError and use it from commands and cmdutil
Wed, 11 Dec 2019 19:42:05 -0800 Kyle Lippincott merge: add commands.merge.require-rev to require an argument to hg merge
Tue, 08 Oct 2019 19:35:30 -0700 Kyle Lippincott destutil: provide hint on rebase+merge for how to specify destination/rev
Sat, 01 Sep 2018 12:15:02 +0900 Yuya Nishihara identify: change {parents} to a list of nodes (BC)
Sat, 01 Sep 2018 12:09:22 +0900 Yuya Nishihara identify: use fm.hexfunc thoroughly
Mon, 26 Jun 2017 09:18:55 +0900 Yuya Nishihara identify: change p1/p2 to a list of parents
Sun, 25 Jun 2017 17:46:35 -0400 Matt Harbison identify: rename 'changed' keyword -> 'dirty'
Sat, 24 Jun 2017 23:09:21 -0400 Matt Harbison identify: add template support
Tue, 06 Jun 2017 22:17:39 +0530 Pulkit Goyal update: show the commit to which we updated in case of multiple heads (BC)
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
Thu, 08 Dec 2011 14:32:44 -0600 Matt Mackall branch: warn on branching stable
Thu, 16 Sep 2010 17:51:32 -0500 Matt Mackall tests: add exit codes to unified tests
Sat, 11 Sep 2010 11:44:53 +0200 Adrian Buehlmann tests: unify test-merge-default base tests/test-merge-default@c19ded5428ab