stefanpenner/ember-cli — pull request #2734 by renato-zannon (2014-12-12 17:14:54+00:00)
Title: app blueprint: don't trim whitespace from diffs

With the current setting, editorconfig-compliant editors will remove trailing whitespace on `.diff` files - which means that solving a conflict with the `e` option (to edit the patch to be applied) becomes impractical.

I've stumbled on this while upgrading my ember-cli project, on the final `ember init` step.