byte[] conflictStart = ("<<<<<<< " + conflictWorking).getBytes();
byte[] conflictEnd = (">>>>>>> " + conflictNew).getBytes();
byte[] separator = ("=======").getBytes();
ISVNMerger merger = factory.createMerger(conflictStart, separator, conflictEnd);
SVNDiffConflictChoiceStyle style = conflictChoice == SVNConflictChoice.THEIRS_CONFLICT ? SVNDiffConflictChoiceStyle.CHOOSE_LATEST :
SVNDiffConflictChoiceStyle.CHOOSE_MODIFIED;
if (merger instanceof DefaultSVNMerger) {
DefaultSVNMerger defaultMerger = (DefaultSVNMerger) merger;
defaultMerger.setDiffConflictStyle(style);
}