public class ConflictKey
extends java.lang.Object
implements java.io.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(java.lang.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()
public boolean equals(java.lang.Object o)
equals
in class java.lang.Object
public int hashCode()
hashCode
in class java.lang.Object