[darcs-users] Help understanding the push with conflicts message

[Nicolas Pouillard]

Excerpts from Ashley Moran's message of Fri Apr 17 16:46:30 +0200 2009:
> 
> On 16 Apr 2009, at 21:26, Nicolas Pouillard wrote:
> 
> > Which version of the zsh completion script do you use? I've recently
> > pushed another version.
> 
> I'm currently using whatever came with my current version of zsh:
> 
> % zsh --version
> zsh --version
> zsh 4.3.4 (powerpc-apple-darwin9.0)
> 
> I tend to use the Apple-bundled version as I've usually noticed it  
> being ahead of the one in MacPorts (I get a choice of zsh @4.2.7 vs  
> zsh-devel @4.3.9).
> 
> Did your changes go to the zsh source, or are they separate?

They are separate at the moment. And just copying instead of the installed one
should work.

-- 
Nicolas Pouillard