Previously when merging two contents with a non-empty base and one of the contents was empty (size == 0) and the other was modified there was a potentially expensive calculation until we finally always come to the same result -> the complete non-deleted content should collide with the empty content. This proposal adds an optimization to detect empty input content and to produce the appropriate result immediatly. Change-Id: Ie6a837260c19d808f0e99173f570ff96dd22acd3 Signed-off-by: Christian Halstrick <christian.halstrick@sap.com> |
13 years ago | |
---|---|---|
.. | ||
CherryPickTest.java | Implement a revert command | 13 years ago |
MergeAlgorithmTest.java | Optimize MergeAlgorithm if ours or theirs is empty | 13 years ago |
MergeMessageFormatterTest.java | Fix "into" part of merge message for HEAD | 13 years ago |
SimpleMergeTest.java | Remove deprecated Repository.mapTree | 13 years ago |