[issue2510] merge prints mysterious message on divergent rename

[Bryan O'Sullivan]

New submission from Bryan O'Sullivan <bos at serpentine.com>:

I have a tree that contains a few divergent renames. When I run "hg merge", it 
prompts me like this:

$ hg merge
remote changed indra/cmake/TemplateCheck.cmake which local deleted
 version or leave (d)eleted? 

As you can see, the beginning of the second line of the prompt is missing, so 
I cannot tell what to do.

This is on a Mac running 10.6.4, with Mercurial being the tip of the default 
branch (cc4e13c92dfa) under the platform's native Python 2.6.

----------
messages: 14461
nosy: bos
priority: bug
status: unread
title: merge prints mysterious message on divergent rename

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