Community technical support mailing list was retired 2010 and replaced with a professional technical support team. For assistance please contact: Pre-sales Technical support via email to firstname.lastname@example.org.
Richard Wirth wrote: > Hello Tony, > > It looks like the Bug 'conflicts duering merge shown as "modified"' is > back again with the latest build (today in the morning)... > > the CVS/Entries file only has 'Result of merge' for the conflicting > files. > Hmm.. works fine here... Are you doing something special/different to trigger the bug? Tony