mercurial: File revisions

Mercurial Mercurial > mercurial / file revisions

summary | shortlog | changelog | graph | tags | bookmarks | branches | file | revisions | annotate | diff | comparison | rss | help
(0) tip

tests/test-merge-criss-cross.t

Mon, 21 Apr 2014 20:24:54 +0200	Mads Kiilerich	merge: improve notes for listing the bids for ambiguous merges stable	file \| diff \| annotate
Fri, 18 Apr 2014 13:33:20 +0200	Mads Kiilerich	merge: tell the user when we are using bid merge stable	file \| diff \| annotate
Mon, 21 Apr 2014 20:22:14 +0200	Mads Kiilerich	merge: fix stray character in bid merge message stable	file \| diff \| annotate
Mon, 21 Apr 2014 20:18:42 +0200	Mads Kiilerich	tests: better test coverage for bid merge stable	file \| diff \| annotate
Fri, 28 Feb 2014 02:52:32 +0100	Mads Kiilerich	*merge: with merge.preferancestor=, run an auction with bids from ancestors**	file \| diff \| annotate
Mon, 24 Feb 2014 22:42:14 +0100	Mads Kiilerich	context: introduce merge.preferancestor for controlling which ancestor to pick	file \| diff \| annotate
Thu, 17 Apr 2014 17:32:04 +0200	Mads Kiilerich	context: tell when .ancestor picks one of multiple common ancestors heads	file \| diff \| annotate
Sun, 02 Mar 2014 18:25:19 +0100	Mads Kiilerich	tests: add test case for criss cross merge	file \| diff \| annotate

less more (0) tip

mercurial