Integer removed = in.readDecimal();
in.mustMatch(FILES_REMOVED);
Integer unresolved = in.readDecimal();
in.mustMatch(" files unresolved\n".getBytes());
if (merged == null || removed == null || unresolved == null) {
throw new UnexpectedCommandOutputException(this.command, null);
}
if (unresolved.intValue() == 0) {
this.mergeConflicts = Collections.emptyList();
// If there is merge conflicts it will be lazy
// intialized
}
} else if (in.match(USE_RESOLVE_EXPLANATION)) {
// ignore
} else if (in.match(USE_RESOLVE_SHORT_EXPLANATION)) {
// ignore
} else if (in.match(BRANCH_MERGE_EXPLANATION)) {
// ignore
} else {
if (whenUnknowReturn) {
return;
} else {
throw new UnexpectedCommandOutputException(Utils.readStream(in,
command.getRepository().getServer().newDecoder()));
}
}
if (endPattern != null) {
String fileName = in.textUpTo(endPattern);