Don't use newly deprecated parameter in tests

ianhattendorf · ianhattendorf · commit 17aca8c2cb49 · 2019-04-17T15:51:59.000-07:00
diff --git a/test/tests/merge.js b/test/tests/merge.js
@@ -646,9 +646,11 @@ describe("Merge", function() {
           ourSignature,
           NodeGit.Merge.PREFERENCE.NO_FASTFORWARD,
           null,
-          function(message) {
-            assert(message === "Merge branch 'theirs' into ours");
-            return "We manipulated the message, HAH.";
+          {
+            processMergeMessageCallback: function(message) {
+              assert(message === "Merge branch 'theirs' into ours");
+              return "We manipulated the message, HAH.";
+            }
           }
         );
       })
@@ -803,9 +805,11 @@ describe("Merge", function() {
           ourSignature,
           NodeGit.Merge.PREFERENCE.NO_FASTFORWARD,
           null,
-          function(message) {
-            assert(message === "Merge branch 'theirs' into ours");
-            return Promise.resolve("We manipulated the message, HAH.");
+          {
+            processMergeMessageCallback: function(message) {
+              assert(message === "Merge branch 'theirs' into ours");
+              return Promise.resolve("We manipulated the message, HAH.");
+            }
           }
         );
       })
