summaryrefslogtreecommitdiff
path: root/xdiff-interface.h
diff options
context:
space:
mode:
authorLibravatar Denton Liu <liu.denton@gmail.com>2019-04-29 04:28:23 -0400
committerLibravatar Junio C Hamano <gitster@pobox.com>2019-05-05 15:20:10 +0900
commitad6dad0996f9226b2c3a5a3c725bf2952e52d7e7 (patch)
treecbde3e662ca85541fd7d0c9b0220776fee59cdbf /xdiff-interface.h
parent*.[ch]: remove extern from function declarations using sed (diff)
downloadtgif-ad6dad0996f9226b2c3a5a3c725bf2952e52d7e7.tar.xz
*.[ch]: manually align parameter lists
In previous patches, extern was mechanically removed from function declarations without care to formatting, causing parameter lists to be misaligned. Manually format changed sections such that the parameter lists should be realigned. Viewing this patch with 'git diff -w' should produce no output. Signed-off-by: Denton Liu <liu.denton@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'xdiff-interface.h')
-rw-r--r--xdiff-interface.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/xdiff-interface.h b/xdiff-interface.h
index a71950a10b..ede4246bbd 100644
--- a/xdiff-interface.h
+++ b/xdiff-interface.h
@@ -47,7 +47,7 @@ void discard_hunk_line(void *priv,
* are treated for the comparision.
*/
int xdiff_compare_lines(const char *l1, long s1,
- const char *l2, long s2, long flags);
+ const char *l2, long s2, long flags);
/*
* Returns a hash of the string s of length len.