rebase: make resolve message clearer for inexperienced users
[git] / t / t5100 / patch0007