Display message to user when diff cannot be applied cleanly
Merge pull request #1091 from rondale-sc/prompt_user_on_misapplied_diff

Display message to user when diff cannot be applied cleanly