Message 7105 - Mercurial issue tracker

Author	tonfa
Recipients	abuehl, benallard, kiilerix, mathieu.clabaut
Date	2008-09-13.08:29:30

Content
So we could disable simplemerge by default, but then be aware that no automated merge tool will do the right thing for both cases.

History
Date	User	Action	Args
2008-09-13 08:29:30	tonfa	set	messageid: <1221294570.45.0.390633741157.issue1295@selenic.com>
2008-09-13 08:29:30	tonfa	set	recipients: + mathieu.clabaut, kiilerix, abuehl, benallard
2008-09-13 08:29:30	tonfa	link	issue1295 messages
2008-09-13 08:29:30	tonfa	create

Message7105