[darcs-users] --mark-conflicts

[Ruben Zilibowitz]

I received the following error from darcs:

   Refusing to apply patches leading to conflicts.
If you would rather apply the patch and mark the conflicts,
use the --mark-conflicts option to apply.

However:

darcs push --mark-conflicts

gives me:

darcs failed:  unrecognized option `--mark-conflicts'

So how does one use this option?

Regards,

Ruben