nodegit · johnhaley81 · Jan 22, 2016 · Jan 21, 2016
diff --git a/lib/repository.js b/lib/repository.js
@@ -725,23 +725,25 @@ Repository.prototype.fetchAll = function(
    });
 };

-
 /**
 * Merge a branch onto another branch
 *
 * @param {String|Ref}        to
 * @param {String|Ref}        from
 * @param {Signature}         signature
 * @param {Merge.PREFERENCE}  mergePreference
+ * @param {MergeOptions}      mergeOptions
 * @return {Oid|Index}  A commit id for a succesful merge or an index for a
 *                      merge with conflicts
 */
 Repository.prototype.mergeBranches =
-  function(to, from, signature, mergePreference) {
+  function(to, from, signature, mergePreference, mergeOptions) {
  var repo = this;
  var fromBranch;
  var toBranch;
+
  mergePreference = mergePreference || NodeGit.Merge.PREFERENCE.NONE;
+  mergeOptions = normalizeOptions(mergeOptions, NodeGit.MergeOptions);

  signature = signature || repo.defaultSignature();

@@ -806,7 +808,12 @@ Repository.prototype.mergeBranches =
        })
        .then(function(headRef) {
          updateHead = !!headRef && (headRef.name() === toBranch.name());
-          return NodeGit.Merge.commits(repo, toCommitOid, fromCommitOid);
+          return NodeGit.Merge.commits(
+            repo,
+            toCommitOid,
+            fromCommitOid,
+            mergeOptions
+          );
        })
        .then(function(index) {
          // if we have conflicts then throw the index
@@ -834,8 +841,8 @@ Repository.prototype.mergeBranches =
            [toCommitOid, fromCommitOid]);
        })
        .then(function(commit) {
-        //   // we've updated the checked out branch, so make sure we update
-        //   // head so that our index isn't messed up
+          // we've updated the checked out branch, so make sure we update
+          // head so that our index isn't messed up
          if (updateHead) {
            return repo.getBranch(to)
            .then(function(branch) {