jan 2004-11-01 10:49:41 PST
Modified files:
scripts merge.php
Log:
Use cvs diff and patch instead of cvs update -j to avoid inline conflicts and
-kk sticky tags.
Revision Changes Path
1.5 +2 -2 horde/scripts/merge.php
Chora Links:
http://cvs.horde.org/diff.php/horde/scripts/merge.php?r1=1.4&r2=1.5&ty=u