merge, pull: stop advising 'commit -a' in case of conflict