Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGeorge C. Young2013-02-21 18:44:40 +0000
committerMatthias Sohn2013-02-22 22:51:50 +0000
commitab99b78ca08a6b52e9ae8b49afa04dd16496f2ac (patch)
treea3e17c1ed142b8a8b2e7ff9431b88eb2f6add786 /README.md
parent95ef1e83d0fa7b82adcb93b734a618a570d32240 (diff)
downloadjgit-ab99b78ca08a6b52e9ae8b49afa04dd16496f2ac.tar.gz
jgit-ab99b78ca08a6b52e9ae8b49afa04dd16496f2ac.tar.xz
jgit-ab99b78ca08a6b52e9ae8b49afa04dd16496f2ac.zip
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>
Diffstat (limited to 'README.md')
-rw-r--r--README.md2
1 files changed, 0 insertions, 2 deletions
diff --git a/README.md b/README.md
index 8d9c137817..6e6c0c7bfe 100644
--- a/README.md
+++ b/README.md
@@ -118,8 +118,6 @@ There are some missing features:
- gitattributes support
-- Recursive merge strategy
-
Support
-------

Back to the top