Fix patch conflicts.

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

diff --git a/detect-renamed.diff b/detect-renamed.diff
index c7b9402ab1c8139f48e3fb91fbb4de7b00746322..270333d47aebc3bed19d9e55eb47d1c7b6375cb3 100644 (file)
--- a/detect-renamed.diff
+++ b/detect-renamed.diff
@@ -38,7 +38,7 @@ TODO:
   a file that can't use it, while missing out on giving it to a file
   that could use it.
 
-based-on: a2b630c0bb586c9761fd5fc53dc4c212b6dd25df
+based-on: 3008e7c2269936672d796d95b85b285fc07adc01
 diff --git a/backup.c b/backup.c
 --- a/backup.c
 +++ b/backup.c