Mercurial > hg

log tests/test-merge-criss-cross.t @ 24787:9d5c27890790

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
less more | (0) tip
age author description
Thu, 11 Dec 2014 20:56:53 -0800 Martin von Zweigbergk merge: let bid merge work on the file->action dict
Wed, 03 Dec 2014 14:03:20 -0800 Martin von Zweigbergk merge: make 'keep' message more descriptive
Wed, 01 Oct 2014 03:42:00 +0200 Mads Kiilerich merge: mute the status message when bid merge kicks in
Wed, 01 Oct 2014 03:41:11 +0200 Mads Kiilerich merge: use bid merge by default (BC)
Wed, 01 Oct 2014 03:40:51 +0200 Mads Kiilerich changectx: skip all invalid merge.preferancestor values
Fri, 15 Aug 2014 02:46:44 +0200 Mads Kiilerich changectx: ancestor should only prefer merge.preferancestor if it is a revision stable
Fri, 15 Aug 2014 02:39:01 +0200 Mads Kiilerich merge: show the scary multiple ancestor hint for merges only, not for updates stable
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, 22 Apr 2014 02:09:24 +0200 Mads Kiilerich merge: make debug output slightly more helpful by including message for action
Mon, 21 Apr 2014 20:24:54 +0200 Mads Kiilerich merge: improve notes for listing the bids for ambiguous merges stable
Fri, 18 Apr 2014 13:33:20 +0200 Mads Kiilerich merge: tell the user when we are using bid merge stable
Mon, 21 Apr 2014 20:22:14 +0200 Mads Kiilerich merge: fix stray character in bid merge message stable
Mon, 21 Apr 2014 20:18:42 +0200 Mads Kiilerich tests: better test coverage for bid merge stable
Fri, 28 Feb 2014 02:52:32 +0100 Mads Kiilerich merge: with merge.preferancestor=*, run an auction with bids from ancestors
Mon, 24 Feb 2014 22:42:14 +0100 Mads Kiilerich context: introduce merge.preferancestor for controlling which ancestor to pick
Thu, 17 Apr 2014 17:32:04 +0200 Mads Kiilerich context: tell when .ancestor picks one of multiple common ancestors heads
Sun, 02 Mar 2014 18:25:19 +0100 Mads Kiilerich tests: add test case for criss cross merge
less more | (0) tip