commit 99771f04bcb6b1a79d4b9c5edff21c994104f8da
author Christian Halstrick <christian.halstrick@sap.com> Tue Nov 02 17:39:59 2010 +0100
committer Christian Halstrick <christian.halstrick@sap.com> Tue Nov 02 18:29:35 2010 +0100
tree 2c78371891519ccb06b715e54876544c49eff65a
parent e8642b538c950ad17b3f67c3bf75306b8f78b545

Fixed merge algorithm regarding adjacent modifications

JGit merge algorithm behaved differently from C Git when
we had adjacent modifications. If line 9 was modified by
OURS and line 10 by theirs then C Git will return a
conflict while JGit was seeing this as independent
modifications. This change is not only there to achieve
compatibility, but there where also some really wrong
merge results produced by JGit in the area of adjacent
modifications.

Change-Id: I8d77cb59e82638214e45b3cf9ce3a1f1e9b35c70
Signed-off-by: Christian Halstrick <christian.halstrick@sap.com>