* John Levon <[EMAIL PROTECTED]> [2001-08-06 17:45] schrieb:
> On Mon, Aug 06, 2001 at 05:15:30PM +0200, Ronny Buchmann wrote:
>
> > but be careful that it doesnt merge modified files with the (older one) from
>repository
>
> eh ? that's what you want anyway. you won't be able to commit unless you're up to
>date.
>
yes, sorry dind't realize that someone already commited a patch which i had applied
manually (and i had done some local modifications)
so the merge was not as expected
but nevertheless looking for merging conflicts too is quite useful
cvs up 2>&1 | grep '^[C?]'
> john
>
--
ronny
