[issue2046] resolve should not overwrite local changes without confirmation

[Sean]

New submission from Sean <sean at caustic.com>:

If the user has made changes to conflicted files after a merge, running "hg 
resolve" should not overwrite those changes without any confirmation.  The 
user probably just forgot to run "hg resolve -m".

----------
messages: 11778
nosy: seangies
priority: bug
status: unread
title: resolve should not overwrite local changes without confirmation
topic: merge

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