[darcs-users] survey: One more question.

[Micah Stetson]

> 11. Did you use the --external-merge option? Keep in mind that this may
>     have been in your ~/.darcs/defaults.

Yes I was.  Removing it, the patch applies without conflicts!

Thanks,

Micah