Modifier and Type | Class and Description |
---|---|
static interface |
PatchListLoader.Factory |
Modifier and Type | Method and Description |
---|---|
static org.eclipse.jgit.revwalk.RevTree |
automerge(org.eclipse.jgit.lib.Repository repo,
org.eclipse.jgit.revwalk.RevWalk rw,
org.eclipse.jgit.revwalk.RevCommit b,
org.eclipse.jgit.merge.ThreeWayMergeStrategy mergeStrategy) |
static org.eclipse.jgit.revwalk.RevTree |
automerge(org.eclipse.jgit.lib.Repository repo,
org.eclipse.jgit.revwalk.RevWalk rw,
org.eclipse.jgit.revwalk.RevCommit b,
org.eclipse.jgit.merge.ThreeWayMergeStrategy mergeStrategy,
boolean save) |
PatchList |
call() |
public PatchList call() throws IOException, PatchListNotAvailableException
call
in interface Callable<PatchList>
IOException
PatchListNotAvailableException
public static org.eclipse.jgit.revwalk.RevTree automerge(org.eclipse.jgit.lib.Repository repo, org.eclipse.jgit.revwalk.RevWalk rw, org.eclipse.jgit.revwalk.RevCommit b, org.eclipse.jgit.merge.ThreeWayMergeStrategy mergeStrategy) throws IOException
IOException
public static org.eclipse.jgit.revwalk.RevTree automerge(org.eclipse.jgit.lib.Repository repo, org.eclipse.jgit.revwalk.RevWalk rw, org.eclipse.jgit.revwalk.RevCommit b, org.eclipse.jgit.merge.ThreeWayMergeStrategy mergeStrategy, boolean save) throws IOException
IOException