Skip to content

Commit 40362dc

Browse files
committed
fix build
1 parent c75958a commit 40362dc

File tree

2 files changed

+2
-1
lines changed

2 files changed

+2
-1
lines changed

lib/package.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -89,6 +89,7 @@
8989
"theirs",
9090
"package.json",
9191
"config",
92+
"turborepo",
9293
"tooling",
9394
"react18-tools",
9495
"mayank1513"

lib/src/merge-processor.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@ export const resolveGitMergeFiles = async <T extends string = InbuiltMergeStrate
112112
fs.readFile(theirsPath, "utf8"),
113113
]);
114114

115-
const parsers = normalizeParsers(normalizedConfig);
115+
const parsers = normalizeParsers({ ...normalizedConfig, filename: "" });
116116

117117
const [ours, parser] = await runParser(oursContent, parsers);
118118
const [base, theirs] = await Promise.all(

0 commit comments

Comments
 (0)