[darcs-devel] darcs patch: Add --{allow, dont-allow, mark}-conflicts to darcs pull.

[Nicolas Pouillard]

Wed Jan 16 20:34:26 CET 2008  nicolas.pouillard at gmail.com
  * Add --{allow,dont-allow,mark}-conflicts to darcs pull.
  
  This patch also merge the --external option to pull_conflicts_options
  like with apply.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: text/x-darcs-patch
Size: 17491 bytes
Desc: A darcs patch for your repository!
Url : http://lists.osuosl.org/pipermail/darcs-devel/attachments/20080116/e27e3392/attachment-0001.bin