Fixed conflicts.
authorWayne Davison <wayne@opencoder.net>
Wed, 14 Sep 2022 07:21:06 +0000 (00:21 -0700)
committerWayne Davison <wayne@opencoder.net>
Wed, 14 Sep 2022 07:21:06 +0000 (00:21 -0700)
commit982d3eea040af87f714c918e3e2d4fe71c1e03d9
tree765bc5aafc9e2b9801ee5ef4a3e9b720e639651e
parentc4166a3c0593a2a64540400eeb0a3229792e4c9a
Fixed conflicts.
27 files changed:
backup-deleted.diff
backup-dir-dels.diff
catch_crash_signals.diff
checksum-reading.diff
checksum-updating.diff
checksum-xattr.diff
clone-dest.diff
congestion.diff
date-only.diff
db.diff
detect-renamed-lax.diff
detect-renamed.diff
direct-io.diff
downdate.diff
fileflags.diff
filter-attribute-mods.diff
ignore-case.diff
kerberos.diff
link-by-hash.diff
omit-dir-changes.diff
slow-down.diff
slp.diff
soften-links.diff
source-backup.diff
source-filter_dest-filter.diff
sparse-block.diff
transliterate.diff