summaryrefslogtreecommitdiff
path: root/t
diff options
context:
space:
mode:
authorJohannes Sixt <j6t@kdbg.org>2010-12-13 11:14:02 +0100
committerJunio C Hamano <gitster@pobox.com>2010-12-13 07:23:51 -0800
commit0d6504cc3cb299eccb3f56bb97d84b3c99e004d4 (patch)
tree0882b3aceb8f4db2d2d357ad79c1f782be32a5ae /t
parentb5c178143088350c49129acbedb864d70c666215 (diff)
downloadgit-0d6504cc3cb299eccb3f56bb97d84b3c99e004d4.tar.gz
Avoid duplicate test number t7609
Signed-off-by: Johannes Sixt <j6t@kdbg.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't')
-rwxr-xr-xt/t7611-merge-abort.sh (renamed from t/t7609-merge-abort.sh)0
1 files changed, 0 insertions, 0 deletions
diff --git a/t/t7609-merge-abort.sh b/t/t7611-merge-abort.sh
index 61890bc892..61890bc892 100755
--- a/t/t7609-merge-abort.sh
+++ b/t/t7611-merge-abort.sh