[cvs] commit: horde/scripts merge.php

[Jan Schneider]

jan         2005-02-20 10:46:22 PST

  Modified files:
    scripts              merge.php 
  Log:
  Allow to merge added files from branches too.
  
  Revision  Changes    Path
  1.16      +2 -2      horde/scripts/merge.php

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