[issue968] Optionally ask before merging (on update, for example)

[Dirkjan Ochtman]

New submission from Dirkjan Ochtman <dirkjan at ochtman.nl>:

Some of the Mozilla folks have problems with inadvertent merges. It would be
nice if there was an option to specify hg should ask before starting a merge.

----------
messages: 5123
nosy: djc
priority: wish
status: unread
title: Optionally ask before merging (on update, for example)
topic: ui

____________________________________________________
Mercurial issue tracker <mercurial-bugs at selenic.com>
<http://www.selenic.com/mercurial/bts/issue968>
____________________________________________________