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
Updated the default list of cvs-excluded files and added some extra
[rsync/rsync.git]
/
testsuite
/
merge.test
diff --git
a/testsuite/merge.test
b/testsuite/merge.test
index
36f83bc
..
73b2b82
100644
(file)
--- a/
testsuite/merge.test
+++ b/
testsuite/merge.test
@@
-47,4
+47,5
@@
touch "$fromdir"? "$chkdir" "$fromdir"?/sub? "$chkdir"/sub?
checkit "$RSYNC -aHvv \"$fromdir\"?/ \"$todir/\"" "$chkdir" "$todir"
+# The script would have aborted on error, so getting here means we've won.
exit 0