Merge branch 'nd/grep-assume-unchanged'

diff --git a/xdiff/xutils.c b/xdiff/xutils.c
index bf91c0f73c658637d078ac93226148faa3bb0dc4..d7974d1a3e612a235b0c8adfde08ba802e782b5a 100644 (file)
--- a/xdiff/xutils.c
+++ b/xdiff/xutils.c
@@ -232,8 +232,6 @@ int xdl_recmatch(const char *l1, long s1, const char *l2, long s2, long flags)
                return i1 >= s1 && i2 >= s2;
        } else
                return s1 == s2 && !memcmp(l1, l2, s1);
-
-       return 0;
 }
 
 static unsigned long xdl_hash_record_with_whitespace(char const **data,
@@ -380,4 +378,3 @@ int xdl_emit_hunk_hdr(long s1, long c1, long s2, long c2,
 
        return 0;
 }
-