Message 7156 - Mercurial issue tracker

Author	mpm
Recipients	abuehl, benallard, cyanite, kiilerix, mathieu.clabaut, pmezard, tonfa
Date	2008-09-17.21:27:53

Content
re msg7148: Yes, this is a bug. The result should be 'error' with no conflicts. Apparently simplemerge is busted. Not sure if the same bustedness is to blame for the other issues though.

History
Date	User	Action	Args
2008-09-17 21:27:54	mpm	set	recipients: + tonfa, pmezard, mathieu.clabaut, kiilerix, abuehl, benallard, cyanite
2008-09-17 21:27:54	mpm	set	messageid: <1221686874.05.0.158546872326.issue1295@selenic.com>
2008-09-17 21:27:53	mpm	link	issue1295 messages
2008-09-17 21:27:53	mpm	create

Message7156