Migrate IgnoreDiFileChangesInGitMergeTest to new test framework

Change-Id: I55fef16f1e775dbb01343632faa1acee5bbe8f53
Signed-off-by: Philip Langer <planger@eclipsesource.com>
12 files changed