Message5677

Author mpm
Recipients brendan, carlsonj
Date 2008-03-21.15:52:10
Content
Mercurial has a whole new file merging infrastructure (including a built-in
3-way merge tool) that imerge hasn't been updated to.

Also note that the bar for inclusion of extensions is much lower than core
functionality. Some of them are not far beyond proof-of-concept stage.
History
Date User Action Args
2008-03-21 15:52:10mpmsetmessageid: <1206114730.6.0.915312910425.issue1045@selenic.com>
2008-03-21 15:52:10mpmsetrecipients: + brendan, carlsonj
2008-03-21 15:52:10mpmlinkissue1045 messages
2008-03-21 15:52:10mpmcreate