Mention that MergeAnalysis is a bitmask

carlosmn · carlosmn · commit 3b5633de219e · 2015-10-26T21:22:22.000+01:00
diff --git a/merge.go b/merge.go
@@ -178,6 +178,9 @@ const (
 	MergePreferenceFastForwardOnly MergePreference = C.GIT_MERGE_PREFERENCE_FASTFORWARD_ONLY
 )
 
+// MergeAnalysis returns the possible actions which could be taken by
+// a 'git-merge' command. There may be multiple answers, so the first
+// return value is a bitmask of MergeAnalysis values.
 func (r *Repository) MergeAnalysis(theirHeads []*AnnotatedCommit) (MergeAnalysis, MergePreference, error) {
 	runtime.LockOSThread()
 	defer runtime.UnlockOSThread()

Original file line number	Diff line number	Diff line change
`@@ -178,6 +178,9 @@ const (`
`178`	`178`	`MergePreferenceFastForwardOnly MergePreference = C.GIT_MERGE_PREFERENCE_FASTFORWARD_ONLY`
`179`	`179`	`)`
`180`	`180`
	`181`	`+// MergeAnalysis returns the possible actions which could be taken by`
	`182`	`+// a 'git-merge' command. There may be multiple answers, so the first`
	`183`	`+// return value is a bitmask of MergeAnalysis values.`
`181`	`184`	`func (r Repository) MergeAnalysis(theirHeads []AnnotatedCommit) (MergeAnalysis, MergePreference, error) {`
`182`	`185`	`runtime.LockOSThread()`
`183`	`186`	`defer runtime.UnlockOSThread()`