Display message to user when diff cannot be applied cleanly

Just pushed a fix `/*jshint validthis:true */` Should be re-running now