public class ConflictKey extends Object implements Serializable
Constructor and Description |
---|
ConflictKey(org.eclipse.jgit.lib.ObjectId commit,
org.eclipse.jgit.lib.ObjectId otherCommit,
SubmitType submitType,
boolean contentMerge) |
Modifier and Type | Method and Description |
---|---|
boolean |
equals(Object o) |
org.eclipse.jgit.lib.ObjectId |
getCommit() |
org.eclipse.jgit.lib.ObjectId |
getOtherCommit() |
SubmitType |
getSubmitType() |
int |
hashCode() |
boolean |
isContentMerge() |
public ConflictKey(org.eclipse.jgit.lib.ObjectId commit, org.eclipse.jgit.lib.ObjectId otherCommit, SubmitType submitType, boolean contentMerge)
public org.eclipse.jgit.lib.ObjectId getCommit()
public org.eclipse.jgit.lib.ObjectId getOtherCommit()
public SubmitType getSubmitType()
public boolean isContentMerge()