X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/05118158f4f59a5f512e5bab640f253332a6e181..eb0cbdaa90087abb4f17bd86cee359a8fe5cad3d:/testsuite/merge.test

diff --git a/testsuite/merge.test b/testsuite/merge.test
index 73b2b82d..43b89bc1 100644
--- a/testsuite/merge.test
+++ b/testsuite/merge.test
@@ -43,9 +43,9 @@ cp -p "$from2dir"/sub1/uno "$from3dir"/sub1/dos "$from2dir"/sub1/tres "$chkdir"/
 cp -p "$from3dir"/sub2/subby "$chkdir"/sub2
 
 # Get rid of any directory-time differences
-touch "$fromdir"? "$chkdir" "$fromdir"?/sub? "$chkdir"/sub?
+$RSYNC -av --existing --include='*/' --exclude='*' "$from1dir/" "$from2dir/" "$from3dir/" "$chkdir/"
 
-checkit "$RSYNC -aHvv \"$fromdir\"?/ \"$todir/\"" "$chkdir" "$todir"
+checkit "$RSYNC -aHvv \"$from1dir/\" \"$from2dir/\" \"$from3dir/\" \"$todir/\"" "$chkdir" "$todir"
 
 # The script would have aborted on error, so getting here means we've won.
 exit 0