Hi All,This patch adds a test to make sure that conflict resolution files are not created in the event of a *dry-run* merge that has binary file conflicts.
The relevant discussion on dev@ is here -> http://svn.haxx.se/dev/archive-2011-03/0145.shtml
Regards, Arwin Arni
