Avoid duplicate test number t7609
authorJohannes Sixt <j6t@kdbg.org>
Mon, 13 Dec 2010 10:14:02 +0000 (11:14 +0100)
committerJunio C Hamano <gitster@pobox.com>
Mon, 13 Dec 2010 15:23:51 +0000 (07:23 -0800)
commit0d6504cc3cb299eccb3f56bb97d84b3c99e004d4
tree0882b3aceb8f4db2d2d357ad79c1f782be32a5ae
parentb5c178143088350c49129acbedb864d70c666215
Avoid duplicate test number t7609

Signed-off-by: Johannes Sixt <j6t@kdbg.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
t/t7611-merge-abort.sh [moved from t/t7609-merge-abort.sh with 100% similarity]