Merge remote-tracking branch 'upstream/master' into next

1 files changed, 3 insertions, 0 deletions

diff --git a/merge.go b/merge.go
index 53d5a72..0b0a8f1 100644
--- a/merge.go
+++ b/merge.go
@@ -185,6 +185,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()