tree cdf058e62107da1de5840b9392d61a3b4828b60c
parent b599b8cd35475a5485b939ab0511f079484906e0
author Laurent Delaigue <laurent.delaigue@obeo.fr> 1486042345 +0100
committer Laurent Delaigue <laurent.delaigue@obeo.fr> 1489485356 -0400

Improve final state and MergeData when merging

Mergers now properly set the final state of diffs according to whether
they were accepted or rejected.
We now install a DiffStateAdapter on the comparison and all its diffs to
listen to diff state changes and update MergeData accordingly.

Change-Id: Ib0945557e4a90feab82280a773ab49237e31c0ce
Signed-off-by: Laurent Delaigue <laurent.delaigue@obeo.fr>