Investigate possible bug when merge results in a property conflict
on a folder AND the same folder also has it's svn:mergeinfo property
updated. The notification is being sent as an 'U'pdate instead of a
'C'onflict. The dir_conflicts.prej file is still being created, the
notification is just wrong. In the observed case, the svn:mergeinfo
property did not exist prior to running the merge command.
This issue was originally reported by Mark Phippard (markphip). It appears to
be a regression introduced in the 1.5.0 timeframe.
Bug
Critical
