diff options
| author | George C. Young <geyoung@rim.com> | 2013-02-21 13:44:40 -0500 |
|---|---|---|
| committer | Matthias Sohn <matthias.sohn@sap.com> | 2013-02-22 23:51:50 +0100 |
| commit | ab99b78ca08a6b52e9ae8b49afa04dd16496f2ac (patch) | |
| tree | a3e17c1ed142b8a8b2e7ff9431b88eb2f6add786 /README.md | |
| parent | 95ef1e83d0fa7b82adcb93b734a618a570d32240 (diff) | |
| download | jgit-ab99b78ca08a6b52e9ae8b49afa04dd16496f2ac.tar.gz 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.md | 2 |
1 files changed, 0 insertions, 2 deletions
@@ -118,8 +118,6 @@ There are some missing features: - gitattributes support -- Recursive merge strategy - Support ------- |