bdfe4d0b73
This version of JGit includes a fix in ResolveMerger to handle conflicts in submodules. Refer to the upstream issue [1] and change [2] for more details. [1] https://bugs.eclipse.org/bugs/show_bug.cgi?id=494551 [2] https://git.eclipse.org/r/110172 Change-Id: Ibb32e927756d833a2f6773e0c81bce678f33e7b1 Signed-off-by: Jacek Centkowski <jcentkowski@collab.net> Signed-off-by: David Pursehouse <dpursehouse@collab.net>