btford/grunt-merge-conflict — pull request #1 by sindresorhus (2013-07-03 19:47:17+00:00)
Title: Make it better

- use this.fileSrc which only returns src files (no dirs)
- removed useless .map
- use async.forEach for perf