Merge branch 'maint'

diff --git a/xdiff/xutils.c b/xdiff/xutils.c
index bf91c0f73c658637d078ac93226148faa3bb0dc4..2ade97b2574a9f77e7ae4002a4e07a6a38e46d07 100644 (file)
--- a/xdiff/xutils.c
+++ b/xdiff/xutils.c
@@ -380,4 +380,3 @@ int xdl_emit_hunk_hdr(long s1, long c1, long s2, long c2,
 
        return 0;
 }
-