Merge branch 'am/cherry-pick-rerere'

diff --git a/xdiff/xdiffi.c b/xdiff/xdiffi.c
index 5cb7171a8f528881c6171defa5b102e87d7aa522..1bad8462fb32cffdc9ff20a278d513e7a444b257 100644 (file)
--- a/xdiff/xdiffi.c
+++ b/xdiff/xdiffi.c
@@ -257,8 +257,6 @@ static long xdl_split(unsigned long const *ha1, long off1, long lim1,
                        return ec;
                }
        }
-
-       return -1;
 }