commit 8783a7f1fa0c6c4e7ff2bc1275c12b0b239bb453
author Philip Langer <planger@eclipsesource.com> Wed Jun 17 13:57:36 2015 +0200
committer Axel RICHARD <axel.richard@obeo.fr> Thu Jun 18 10:53:07 2015 -0400
tree 55d1558ddd40bf3ae7a7fc0ff02b0b15f1b5bd4b
parent af3356ddf8417b248e2418f86492d04881513321

[462884] Allows merging specific diffs in MergeAllNonConflictingRunnable

Renames MergeAllNonConflictingRunnable to MergeNonConflictingRunnable,
as it now allows to also merge a specific set of differences with the
same strategy as for all non-conflicting differences. Therefore, this
runnable now also implements IMergeRunnable.

Accordingly, also the test class for MergeNonConflictingRunnable have
been extended concerning the use cases for merging a given list of
differences only.

Also we introduce additional two-way tests in MergeAllCommandTests.

Bug: 462884
Change-Id: I80518d479db18c19bd51ebdabe5789ca58850672
Signed-off-by: Philip Langer <planger@eclipsesource.com>