IMerger.Registry registry = EMFCompareRCPPlugin.getDefault().getMergerRegistry();
			IBatchMerger merger = new BatchMerger(registry);
			PseudoConflictMerger pseudoConflictMerger = new PseudoConflictMerger();
                        
                        //TODO merge all non-conflicting changes - but how?

			for (Conflict conflict : comparison.getConflicts()) {
				if (conflict.getKind() == ConflictKind.PSEUDO) {
					// don't do anything except for marking it as merged
					for (Diff diff : conflict.getDifferences()) {
						pseudoConflictMerger.copyLeftToRight(diff, new BasicMonitor());
					}
				} else {
					// call the callback operation
					MergeConflictResolution resolution = conflictResolver.resolve(conflict);
					switch (resolution) {
						case USE_MINE:
							merger.copyAllRightToLeft(conflict.getDifferences(), new BasicMonitor());
							break;
						case USE_THEIRS:
							merger.copyAllLeftToRight(conflict.getDifferences(), new BasicMonitor());
							break;
						default:
							throw new RuntimeException("Unknown MergeConflictResolution type: " + resolution);
					}
				}
			}

public void copyAllLeftToRight(Iterable<? extends Diff> differences, Monitor monitor) {
	for (Diff diff : Iterables.filter(differences, filter)) {
		if (diff.getState() != DifferenceState.MERGED) {
			copyLeftToRight(diff, monitor);
		}
	}
}

private void copyLeftToRight(Diff diff, Monitor monitor) {
	// The only diffs that need particular handling are the conflicting ones, less the pseudo-conflicts.
	final IMerger merger = registry.getHighestRankingMerger(diff);
	if (diff.getConflict() != null && diff.getConflict().getKind() != ConflictKind.PSEUDO) {
		handleConflictCopy(diff, merger, monitor);
	} else {
		merger.copyLeftToRight(diff, monitor);
	}
}

private void handleConflictCopy(Diff diff, IMerger merger, Monitor monitor) {
	MergeConflictResolution resolution = conflictResolver.resolve(conflict);
	switch (resolution) {
		case USE_MINE:
			merger.copyRightToLeft(diff, monitor);
			break;
		case USE_THEIRS:
			merger.copyLeftToRight(diff, monitor);
			break;
		default:
			throw new RuntimeException("Unknown MergeConflictResolution type: " + resolution);
	}
}