[cvs] commit: framework/devtools horde-merge.php

[Jan Schneider]

jan         2009-05-01 09:10:25 EDT

  Modified files:
    devtools             horde-merge.php 
  Log:
  Add target -t flag. Only useful for merging updates from CVS to Git. Doesn't
  work with removes, additions, or in the opposite direction.
  
  Revision  Changes    Path
  1.10      +9 -4      framework/devtools/horde-merge.php

  Chora Links:
  http://cvs.horde.org/diff.php/framework/devtools/horde-merge.php?rt=horde&r1=1.9&r2=1.10&ty=u