jan 2002/09/11 07:31:41 PDT Modified files: scripts merge.php Log: Make it easier to merge commits within the horde module. Revision Changes Path 1.2 +2 -2 horde/scripts/merge.php Chora Links: http://cvs.horde.org/diff.php/horde/scripts/merge.php?r1=1.1&r2=1.2&ty=u