Fixed conflicts.

[rsync-patches.git] / direct-io.diff

diff --git a/direct-io.diff b/direct-io.diff
index 05910397bde8a1c5105afb441b15dedff4fc56c1..c6850d93f11696b27bcc4b3c53c47108ac8b8fb6 100644 (file)
--- a/direct-io.diff
+++ b/direct-io.diff
@@ -10,7 +10,7 @@ To use this patch, run these commands for a successful build:
     ./configure                         (optional if already run)
     make
 
-based-on: db5bfe67a5d022f9ad25340db6bc2cca2cbbdb65
+based-on: 8b1b81e054bdcc927ff26f20f424e034bd273175
 diff --git a/options.c b/options.c
 --- a/options.c
 +++ b/options.c
@@ -42,7 +42,7 @@ diff --git a/rsync.1.md b/rsync.1.md
  --prune-empty-dirs, -m   prune empty directory chains from file-list
  --numeric-ids            don't map uid/gid values by user/group name
  --usermap=STRING         custom username mapping
-@@ -3374,6 +3375,17 @@ expand it.
+@@ -3380,6 +3381,17 @@ expand it.
      update algorithm that is even more atomic (it uses [`--link-dest`](#opt)
      and a parallel hierarchy of files).