Mercurial > hg
log tests/test-merge-criss-cross.t @ 21170:ea3972243320 stable
| age | author | description |
|---|---|---|
| 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 |