Skip to content

Commit d14b1e4

Browse files
committed
feat: add MergeError class
1 parent 90a9ca0 commit d14b1e4

1 file changed

Lines changed: 1 addition & 1 deletion

File tree

test/merge/config/merge-config.test.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ describe('merge flag configuration', () => {
1717
});
1818
it('merges two configurations together with flag alias', (done) => {
1919
const { stdout } = run(__dirname, ['--config', './1.js', '-m', './2.js'], false);
20-
expect(stdout).toContain('option has not been set, webpack will fallback to');
20+
expect(stdout).toContain('merged.js');
2121
stat(resolve(__dirname, './dist/merged.js'), (err, stats) => {
2222
expect(err).toBe(null);
2323
expect(stats.isFile()).toBe(true);

0 commit comments

Comments
 (0)