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
Changed the "s" modifier to "w" for a word-splitting merge file.
[rsync/rsync.git]
/
flist.c
diff --git
a/flist.c
b/flist.c
index
b88ab8b
..
9ee7dcd
100644
(file)
--- a/
flist.c
+++ b/
flist.c
@@
-1690,7
+1690,7
@@
void delete_in_dir(struct file_list *flist, char *fname)
if (io_error && !(lp_ignore_errors(module_id) || ignore_errors)) {
rprintf(FINFO,
if (io_error && !(lp_ignore_errors(module_id) || ignore_errors)) {
rprintf(FINFO,
- "IO error encountered - skipping file deletion\n");
+ "IO error encountered -
-
skipping file deletion\n");
max_delete = -1; /* avoid duplicating the above warning */
return;
}
max_delete = -1; /* avoid duplicating the above warning */
return;
}