Andrew's git
/
gitweb.git
/ blobdiff
summary
|
log
|
commit
|
diff
|
tree
commit
grep
author
committer
pickaxe
?
re
t1700: add tests for splitIndex.maxPercentChange
[gitweb.git]
/
t
/
t7610-mergetool.sh
diff --git
a/t/t7610-mergetool.sh
b/t/t7610-mergetool.sh
index 6d9f21511fe1062565d8d08f60c385cffd94cac6..63d36fb28e44426708a743979c4bc341bdac714e 100755
(executable)
--- 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' '