fix merge conflicts test

zawata · zawata · commit 999b8a121762 · 2024-02-09T14:46:24.000-07:00
the OID of the resulting commit has changed because the conflicts list of a Merge conflict is no longer commented, thus changing the commit message. the other content of the commit is unchanged
diff --git a/test/tests/merge.js b/test/tests/merge.js
@@ -1592,7 +1592,7 @@ describe("Merge", function() {
       })
       .then(function(commitOid) {
         assert.equal(commitOid.toString(),
-          "03ba156a7a1660f179b6b2dbc6a542fcf88d022d");
+          "8221726e3f96e3d3e0258f655e107383dc3c7335");
 
         // merge isn't cleaned up automatically
         assert.ok(fse.existsSync(path.join(repoGitPath, "MERGE_HEAD")));
