X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/37c817eb8159366539d4a9c69bd78e74d4941c06..5c6fc4a6a3328d9995377efdc05a90987b96d9a2:/testsuite/merge.test

diff --git a/testsuite/merge.test b/testsuite/merge.test
index 36f83bc6..43b89bc1 100644
--- a/testsuite/merge.test
+++ b/testsuite/merge.test
@@ -43,8 +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