Fixed DiffMerge invocation