public static class DocumentMapper.MergeResult extends Object
Constructor and Description |
---|
MergeResult(String[] conflicts) |
Modifier and Type | Method and Description |
---|---|
String[] |
conflicts()
The merge conflicts.
|
boolean |
hasConflicts()
Does the merge have conflicts or not?
|
Copyright © 2009–2015. All rights reserved.