private void resetRevert() throws IOException { repo.writeRevertHead(null); repo.writeMergeCommitMsg(null); }
private void resetRevert() throws IOException { repo.writeRevertHead(null); repo.writeMergeCommitMsg(null); }
private void resetRevert() throws IOException { repo.writeRevertHead(null); repo.writeMergeCommitMsg(null); }
} else if (state == RepositoryState.REVERTING_RESOLVED) { repo.writeMergeCommitMsg(null); repo.writeRevertHead(null);
.formatWithConflicts(newMessage, merger.getUnmergedPaths()); repo.writeRevertHead(srcCommit.getId()); repo.writeMergeCommitMsg(message);
} else if (state == RepositoryState.REVERTING_RESOLVED) { repo.writeMergeCommitMsg(null); repo.writeRevertHead(null);
} else if (state == RepositoryState.REVERTING_RESOLVED) { repo.writeMergeCommitMsg(null); repo.writeRevertHead(null);
.formatWithConflicts(newMessage, merger.getUnmergedPaths()); repo.writeRevertHead(srcCommit.getId()); repo.writeMergeCommitMsg(message);
.formatWithConflicts(newMessage, merger.getUnmergedPaths()); repo.writeRevertHead(srcCommit.getId()); repo.writeMergeCommitMsg(message);