X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/284d628a7ca583b61a424241fa046856be5842b3..bd6abc4939621c455f931905f0530115eb8c443c:/testsuite/merge.test diff --git a/testsuite/merge.test b/testsuite/merge.test index 3a195c48..36f83bc6 100644 --- a/testsuite/merge.test +++ b/testsuite/merge.test @@ -43,7 +43,7 @@ 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 -find "$from1dir" "$from2dir" "$from3dir" "$chkdir" -type d -print0 | xargs -0 touch +touch "$fromdir"? "$chkdir" "$fromdir"?/sub? "$chkdir"/sub? checkit "$RSYNC -aHvv \"$fromdir\"?/ \"$todir/\"" "$chkdir" "$todir"