summaryrefslogtreecommitdiff
path: root/merge.go
diff options
context:
space:
mode:
Diffstat (limited to 'merge.go')
-rw-r--r--merge.go4
1 files changed, 3 insertions, 1 deletions
diff --git a/merge.go b/merge.go
index dc0e7ca..a8e7d6e 100644
--- a/merge.go
+++ b/merge.go
@@ -17,6 +17,7 @@ import (
)
type AnnotatedCommit struct {
+ doNotCompare
ptr *C.git_annotated_commit
r *Repository
}
@@ -426,11 +427,12 @@ func (r *Repository) MergeBaseOctopus(oids []*Oid) (*Oid, error) {
}
type MergeFileResult struct {
+ doNotCompare
+ ptr *C.git_merge_file_result
Automergeable bool
Path string
Mode uint
Contents []byte
- ptr *C.git_merge_file_result
}
func newMergeFileResultFromC(c *C.git_merge_file_result) *MergeFileResult {