fix merger unit tests

Author: mayank1513

lib/package.json

@@ -87,6 +87,7 @@
     "diff",
     "ours",
     "theirs",
+    "base",
     "package.json",
     "config",
     "turborepo",

lib/src/index.test.ts

@@ -85,6 +85,7 @@ describe("resolveConflicts", () => {
         strategies: {},
         _strategyCache: expect.any(Map),
       }),
+      logger: mockLogger,
     });
     expect(mockBackupFile).toHaveBeenCalledWith("test.json", undefined);
     expect(mockSerialize).toHaveBeenCalledWith("json", mergedResult);

lib/src/merge-processor.test.ts

@@ -79,6 +79,7 @@ describe("processMerge", () => {
         strategies: {},
         _strategyCache: expect.any(Map),
       }),
+      logger: mockLogger,
     });
     expect(mockBackupFile).toHaveBeenCalledWith("test.json", undefined);
     expect(mockSerialize).toHaveBeenCalledWith("json", mergedResult);
@@ -253,7 +254,7 @@ describe("resolveGitMergeFiles", () => {
 
     await resolveGitMergeFiles("ours.json", "base.json", "theirs.json", { debug: true });
 
-    expect(mockLogger.info).toHaveBeenCalledWith(
+    expect(mockLogger.debug).toHaveBeenCalledWith(
       "git-merge",
       "Merging files: ours=ours.json, base=base.json, theirs=theirs.json",
     );

lib/src/merge-processor.ts

@@ -54,9 +54,7 @@ export const processMerge = async <T extends string = InbuiltMergeStrategies>({
     backupFile(filePath, config.backupDir),
   ]);
 
-  if (normalizedConfig.debug) {
-    logger.debug(filePath, JSON.stringify({ merged, conflicts }, null, 2));
-  }
+  logger.debug(filePath, JSON.stringify({ merged, conflicts }, null, 2));
 
   if (conflicts.length === 0) {
     const serialized = await serialize(format, merged);