[cvs] commit: horde/scripts merge.php

[Jan Schneider]

jan         2005-05-16 13:16:04 PDT

  Modified files:
    scripts              merge.php 
  Log:
  Add -c parameter to commit merged files after merging.
  
  Revision  Changes    Path
  1.19      +14 -2     horde/scripts/merge.php

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