Re: conflict on added files

[Derek Robert Price]

Paul Edwards wrote:

> Derek, I've just been going through some old stuff to see what
> made it in so far, thanks for doing the "rdiff -s" with version
> number for "removed".  But what is the status of this one?
>
> You were concerned that it was easy to get around this conflict
> by just doing a "touch", but I think it is better to have some
> sort of safety net rather than none, even if ideally it would
> reference /dev/null and do a 3-way merge to get conflict
> markers in the code itself.
>
> BFN.  Paul.
>  

Try that again as a universal or context diff and I'll take a look.

Derek

--
               *8^)

Email: derek@ximbiot.com

Get CVS support at <http://ximbiot.com>!
--
I will not sell miracle cures.
I will not sell miracle cures.
I will not sell miracle cures...

         - Bart Simpson on chalkboard, _The Simpsons_