commit 814919e9de93aacc099b18fd76dac201e115b465
author Edgar Mueller <emueller@eclipsesource.com> Wed Apr 27 11:10:20 2016 +0200
committer Laurent Delaigue <laurent.delaigue@obeo.fr> Wed Jun 08 09:30:44 2016 -0400
tree da6a400e495e5f7a5146db40b3eb5788e0a4041e
parent 47b7b52b3c1798a536783d652c38fcf4b03dd5d6

[486923,488941] Fix Stack Overflow in ThreeWayComparisonGroupProvider

When conflicts contain diffs which are refined by containment reference
changes located in a match above a Stackoverflow exception can occur.
This is now avoided.

Bug: 486923
Bug: 488941
Change-Id: I1e6e4b465450baf07c8141d1580cf854bcd02783
Signed-off-by: Simon Delisle <simon.delisle@ericsson.com>
Signed-off-by: Edgar Mueller <emueller@eclipsesource.com>
Signed-off-by: Stefan Dirix <sdirix@eclipsesource.com>
Signed-off-by: Alexandra Buzila <abuzila@eclipsesource.com>
Signed-off-by: Philip Langer <planger@eclipsesource.com>
Also-by: Alexandra Buzila <abuzila@eclipsesource.com>
Also-by: Simon Delisle <simon.delisle@ericsson.com>