Display message to user when diff cannot be applied cleanly

Please prefix with `[BUGFIX]`.