Add merge-subtree back

diff --git a/xdiff/xdiffi.c b/xdiff/xdiffi.c
index 9aeebc473b11a3dbfa5b52930b4a8e5a35f22215..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;
 }
 
 
@@ -565,4 +563,3 @@ int xdl_diff(mmfile_t *mf1, mmfile_t *mf2, xpparam_t const *xpp,
 
        return 0;
 }
-