slushjs/gulp-conflict — pull request #3 by mgan59 (2014-10-31 15:03:42+00:00)
Title: clarifying keeping message for #2

Simple text changes, let me know if for the `replaceAll` logic branch if we should indicate that it is a forced replace replace as `no conflict` is sorta misleading in that context.