Ted Stern <[EMAIL PROTECTED]> wrote: > I am finding Keyword expansion problematic in certain contexts. In > particular, merging changes between branches.
When that gets out of hand, I do my merges with
cvs update -kk -jTAG_1 -jTAG_2
After I've fixed the conflicts and committed the merge, I get rid
of the sticky "-kk" with an "update -A".
--
pa at panix dot com
