[issue202] add history-sensitive merge

[Bryan O'Sullivan]

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

Mike Kupfer asked if there was an issue associated with the work Vadim's been
doing on history-sensitive merge.  Now there is :-)

----------
assignedto: vadim
messages: 988
nosy: bos, vadim
priority: feature
status: unread
title: add history-sensitive merge

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