Fix a patch conflict.

[rsync-patches.git] / detect-renamed-lax.diff

diff --git a/detect-renamed-lax.diff b/detect-renamed-lax.diff
index 4b8a4f77058eefd08258c771b992302c3edfdffb..7ea637f7b15ce454a563439791afc780e8ffbe57 100644 (file)
--- a/detect-renamed-lax.diff
+++ b/detect-renamed-lax.diff
@@ -91,7 +91,7 @@ diff --git a/options.c b/options.c
 diff --git a/rsync.1.md b/rsync.1.md
 --- a/rsync.1.md
 +++ b/rsync.1.md
-@@ -428,6 +428,8 @@ has its own detailed description later in this manpage.
+@@ -446,6 +446,8 @@ has its own detailed description later in this manpage.
  --temp-dir=DIR, -T       create temporary files in directory DIR
  --fuzzy, -y              find similar file for basis if no dest file
  --detect-renamed         try to find renamed files to speed the xfer
@@ -100,7 +100,7 @@ diff --git a/rsync.1.md b/rsync.1.md
  --compare-dest=DIR       also compare destination files relative to DIR
  --copy-dest=DIR          ... and include copies of unchanged files
  --link-dest=DIR          hardlink to files in DIR when unchanged
-@@ -2464,6 +2466,20 @@ your home directory (remove the '=' for that).
+@@ -2517,6 +2519,20 @@ option name from the pathname using a space if you want the shell to expand it.
      otential alternate-basis files will be removed as the transfer progresses.
      This option conflicts with [`--inplace`](#opt) and [`--append`](#opt).