X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/b0e9bafc78e066b1d67c07c8f9c022a4c900ed27..7892e5ac776e06391b903a9da62972cb37cb4a47:/testsuite/merge.test

diff --git a/testsuite/merge.test b/testsuite/merge.test
index 43b89bc1..0ef39849 100644
--- a/testsuite/merge.test
+++ b/testsuite/merge.test
@@ -7,18 +7,15 @@
 
 # Make sure we can merge files from multiple directories into one.
 
-. $srcdir/testsuite/rsync.fns
+. "$suitedir/rsync.fns"
 
 set -x
 
 # Build some files/dirs/links to copy
 
-fromdir="$scratchdir/from"
 from1dir="${fromdir}1"
 from2dir="${fromdir}2"
 from3dir="${fromdir}3"
-todir="$scratchdir/to"
-chkdir="$scratchdir/chk"
 
 mkdir "$from1dir" "$from2dir" "$from3dir"
 mkdir "$from2dir"/sub1 "$from3dir"/sub1