[cvs] commit: horde/scripts merge.php

[Marko Djukic]

mdjukic     2005-11-16 10:18:50 PST

  Modified files:
    scripts              merge.php 
  Log:
  this fixes for me when merging files in newly created directories, doing a mkdir first will not create the CVS directory for cvs up to succeed later on, with a cvs co the directory will be created with the CVS directory under it.
  
  Revision  Changes    Path
  1.23      +4 -3      horde/scripts/merge.php

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