Browse files

fix(legacy): warn people that legacy mode might throw away some of th…

…eir changes
  • Loading branch information...
zkat committed Dec 4, 2017
1 parent 192c589 commit d6332057202a2f01148d919c429c9e1dc4ca7ed9
Showing with 2 additions and 1 deletion.
  1. +2 −1 index.js
@@ -197,8 +197,9 @@ function merge (argv) {
fs.writeFileSync(argv['%P'], fs.readFileSync(argv['%B']))
'npm-merge-driver: --legacy enabled. Checking out --theirs and retrying merge'
'npm-merge-driver: --legacy enabled. Checking out --theirs and retrying merge.'
console.error('npm-merge-driver: !!!SOME CHANGES MAY BE LOST!!!')
cp.execSync(argv.command, {
stdio: 'inherit',
cwd: path.dirname(argv['%P'])

0 comments on commit d633205

Please sign in to comment.