3 Commits

Author	SHA1	Message	Date
George C. Young	ab99b78ca0	Implement recursive merge strategy ... Extend ResolveMerger with RecursiveMerger to merge two tips that have up to 200 bases. Bug: 380314 CQ: 6854 Change-Id: I6292bb7bda55c0242a448a94956f2d6a94fddbaa Also-by: Christian Halstrick <christian.halstrick@sap.com> Signed-off-by: Chris Aniszczyk <zx@twitter.com> Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>	2013-02-22 23:51:50 +01:00
Robin Stocker	9fbe88aab1	Update README ... Extend introduction, update links and remove outdated information. Change-Id: I29f4d72c980008b6bebe3b009d58c915cd091b9d Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>	2012-09-28 23:21:22 +02:00
Robin Stocker	6b74aff641	README: Convert to Markdown and rename to README.md ... This makes it display nicely on the GitHub mirror repository. And it is still very pleasant to read in plain text. Change-Id: I0c5e1caa58a22684cdbd9a02e9ec38e97d5adb1a Signed-off-by: Robin Stocker <robin@nibor.org>	2012-09-08 19:58:37 +02:00