summaryrefslogtreecommitdiff
path: root/xdiff-interface.h
diff options
context:
space:
mode:
Diffstat (limited to 'xdiff-interface.h')
-rw-r--r--xdiff-interface.h8
1 files changed, 8 insertions, 0 deletions
diff --git a/xdiff-interface.h b/xdiff-interface.h
index 2dbe2fe..8af245e 100644
--- a/xdiff-interface.h
+++ b/xdiff-interface.h
@@ -36,6 +36,14 @@ extern int git_xmerge_config(const char *var, const char *value, void *cb);
extern int git_xmerge_style;
/*
+ * Can be used as a no-op hunk_fn for xdi_diff_outf(), since a NULL
+ * one just sends the hunk line to the line_fn callback).
+ */
+void discard_hunk_line(void *priv,
+ long ob, long on, long nb, long nn,
+ const char *func, long funclen);
+
+/*
* Compare the strings l1 with l2 which are of size s1 and s2 respectively.
* Returns 1 if the strings are deemed equal, 0 otherwise.
* The `flags` given as XDF_WHITESPACE_FLAGS determine how white spaces