[cvs] commit: horde/scripts merge.php

[Jan Schneider]

jan         2005-03-07 07:02:38 PST

  Modified files:
    scripts              merge.php 
  Log:
  First get all lines, then apply patches.
  
  Revision  Changes    Path
  1.17      +5 -2      horde/scripts/merge.php

  Chora Links:
  http://cvs.horde.org/diff.php/horde/scripts/merge.php?r1=1.16&r2=1.17&ty=u