Class ConflictKey

    • Constructor Detail

      • ConflictKey

        public ConflictKey​(org.eclipse.jgit.lib.ObjectId commit,
                           org.eclipse.jgit.lib.ObjectId otherCommit,
                           SubmitType submitType,
                           boolean contentMerge)
    • Method Detail

      • getCommit

        public org.eclipse.jgit.lib.ObjectId getCommit()
      • getOtherCommit

        public org.eclipse.jgit.lib.ObjectId getOtherCommit()
      • getSubmitType

        public SubmitType getSubmitType()
      • isContentMerge

        public boolean isContentMerge()
      • hashCode

        public int hashCode()
        Overrides:
        hashCode in class Object