[issue419] merge: updating from 0.9.1 to tip (3645:b984dcb1df71) causes spurious conflicts

[Brendan Cully]

New submission from Brendan Cully <brendan at kublai.com>:

corecode noted on IRC:

hg clone hg tmp
cd tmp
hg up 0.9.1
hg up tip

causes hg to attempt to merge templates that were moved into subdirectories.

----------
messages: 2353
nosy: brendan
priority: bug
status: unread
title: merge: updating from 0.9.1 to tip (3645:b984dcb1df71) causes spurious conflicts

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