X-Git-Url: http://git.osdn.net/view?a=blobdiff_plain;f=t%2Ft7610-mergetool.sh;h=4db24d527e245bcf96f161e3b3ebc1a8fdbfede3;hb=fa3142c9193bb31e7154d0f0cd7d15208a8dd51a;hp=7217f3968d51d9061b14bd46c473329b26bb087c;hpb=c578a09bd6310157ea69bb1d2ec2d3d2cc58c85a;p=git-core%2Fgit.git

diff --git a/t/t7610-mergetool.sh b/t/t7610-mergetool.sh
index 7217f3968..4db24d527 100755
--- a/t/t7610-mergetool.sh
+++ b/t/t7610-mergetool.sh
@@ -591,7 +591,8 @@ test_expect_success 'filenames seen by tools start with ./' '
 
 test_lazy_prereq MKTEMP '
 	tempdir=$(mktemp -d -t foo.XXXXXX) &&
-	test -d "$tempdir"
+	test -d "$tempdir" &&
+	rmdir "$tempdir"
 '
 
 test_expect_success MKTEMP 'temporary filenames are used with mergetool.writeToTemp' '