Got rid of the --no-ir kluge in this test.

diff --git a/testsuite/merge.test b/testsuite/merge.test
index e1d1fc1..cd10a2a 100644 (file)
--- a/testsuite/merge.test
+++ b/testsuite/merge.test
@@ -48,8 +48,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/
 

-# TODO: fix inc-recurse unduplications of directory contents!
-checkit "$RSYNC -avv --no-ir deep/arg-test shallow from1/ from2/ from3/ to/" chk to
+checkit "$RSYNC -avv deep/arg-test shallow from1/ from2/ from3/ to/" chk to

 
 # 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