rollup/test/form/internal-conflict-resolution/_expected/es.js

mirror of https://github.com/lukechilds/rollup.git
var bar$1 = 42;

function foo () {
	return bar$1;
}

function bar () {
	alert( foo() );
}

bar();
brute force merge rewrite -> rewrite-master 9 years ago			`var bar$1 = 42;`
saner deconflicting 10 years ago
			`function foo () {`
brute force merge rewrite -> rewrite-master 9 years ago			`return bar$1;`
saner deconflicting 10 years ago			`}`

brute force merge rewrite -> rewrite-master 9 years ago			`function bar () {`
saner deconflicting 10 years ago			`alert( foo() );`
			`}`

brute force merge rewrite -> rewrite-master 9 years ago			`bar();`