merge_conflict_resolver.js.coffee 3.16 KB