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

[Tommy Pettersson]

On Wed, Jan 16, 2008 at 07:36:30PM +0000, Nicolas Pouillard wrote:
> 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.

Hmmm... I don't think merging --external-merger to the
multi-choice option is a good idea. A common case is to have
'ALL external-merger my_favorite_merger" in the .darcs/defaults
file, and expect 'darcs apply --mark-conflicts' to use
my_favorite_merger.


-- 
Tommy Pettersson <ptp at lysator.liu.se>