Matt McCutchen's Web Site
/
rsync
/
rsync.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
- Made the itemize test check for CAN_HARDLINK_SYMLINK define instead
[rsync/rsync.git]
/
testsuite
/
merge.test
diff --git
a/testsuite/merge.test
b/testsuite/merge.test
index
cc979bc
..
1720a18
100644
(file)
--- a/
testsuite/merge.test
+++ b/
testsuite/merge.test
@@
-51,7
+51,7
@@
$RSYNC -av --existing -f 'exclude,! */' from2/ from3/
$RSYNC -av --existing -f 'exclude,! */' from1/ chk/
$RSYNC -av --existing -f 'exclude,! */' from3/ chk/
$RSYNC -av --existing -f 'exclude,! */' from1/ chk/
$RSYNC -av --existing -f 'exclude,! */' from3/ chk/
-checkit "$RSYNC -avv deep/arg-test shallow from1/ from2/ from3/ to/"
chk to
+checkit "$RSYNC -avv deep/arg-test shallow from1/ from2/ from3/ to/"
"$chkdir" "$todir"
# The script would have aborted on error, so getting here means we've won.
exit 0
# The script would have aborted on error, so getting here means we've won.
exit 0