[cvs] commit: horde/scripts merge.php

[Jan Schneider]

jan         2004-11-25 04:40:37 PST

  Modified files:
    scripts              merge.php 
  Log:
  Exclude keywords from diffs.
  
  Revision  Changes    Path
  1.7       +2 -2      horde/scripts/merge.php

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