| Package | Description |
|---|---|
| org.tmatesoft.svn.core.internal.wc2.ng |
| Modifier and Type | Field and Description |
|---|---|
(package private) SvnConflictReport |
SvnNgMergeDriver.MergeData.conflictReport |
| Modifier and Type | Method and Description |
|---|---|
private SvnConflictReport |
SvnNgMerge.merge(java.io.File target) |
| Modifier and Type | Method and Description |
|---|---|
static void |
SvnNgMergeDriver.makeMergeConflictError(SvnConflictReport report) |