boolean (Object o) { if (this == o) return true; if (o == null || getClass() != o.getClass()) return false; GitConflict conflict = (GitConflict)o; return myRoot.equals(conflict.myRoot) && myFilePath.equals(conflict.myFilePath) && myOurStatus == conflict.myOurStatus && myTheirStatus == conflict.myTheirStatus; }