protected void initDefaults() { setDiffGenerator(null); setMergeOptions(null); setRecurseIntoDeletedDirectories(true); }
client.setMergeOptions(getSVNEnvironment().getDiffOptions()); try { if (!twoSourcesSpecified) {
client.setMergeOptions(getSVNEnvironment().getDiffOptions()); try { if (!twoSourcesSpecified) {