slusarz 2007-04-19 08:38:21 EDT Modified files: devtools horde-merge.php Log: Provide easy way to change location of CVS binary. Revision Changes Path 1.3 +10 -7 framework/devtools/horde-merge.php Chora Links: http://cvs.horde.org/diff.php/framework/devtools/horde-merge.php?r1=1.2&r2=1.3&ty=u