From 90d80ab7502831826ba0a490893a4faa31069f1e Mon Sep 17 00:00:00 2001 From: Kyle Smith Date: Thu, 3 Mar 2016 17:20:05 -0700 Subject: [PATCH] Docs: improved Merge.merge param docs --- lib/merge.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/merge.js b/lib/merge.js index 79f9a2b44..818f95c02 100644 --- a/lib/merge.js +++ b/lib/merge.js @@ -29,7 +29,7 @@ Merge.commits = function(repo, ourCommit, theirCommit, options) { * Merge a commit into HEAD and writes the results to the working directory. * * @param {Repository} repo Repository that contains the given commits - * @param {Commit} theirHead The annotated to merge into HEAD + * @param {AnnotatedCommit} theirHead The annotated commit to merge into HEAD * @param {MergeOptions} [mergeOpts] The merge tree options (null for default) * @param {CheckoutOptions} [checkoutOpts] The checkout options * (null for default)