t7606: fix custom merge test
[git] / t / t7606-merge-custom.sh
2008-08-24  Junio C Hamanot7606: fix custom merge test
2008-07-30  Miklos VajnaAdd a new test for using a custom merge strategy