diff options
| author | Tay Ray Chuan <rctay89@gmail.com> | 2011-07-07 12:23:57 +0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-07-07 09:41:24 -0700 |
| commit | 1d26b252f1128f7b31885811d7f481b6b7612bd7 (patch) | |
| tree | 36aca90d478d89489ac8901981c4fd9544a57ba8 /xdiff/xutils.h | |
| parent | 159607a8f1ad16c0a04e0f17d5f8a35299696bc6 (diff) | |
| download | git-1d26b252f1128f7b31885811d7f481b6b7612bd7.tar.gz git-1d26b252f1128f7b31885811d7f481b6b7612bd7.tar.xz | |
xdiff/xpatience: factor out fall-back-diff function
This is in preparation for the histogram diff algorithm, which will also
re-use much of the code to call the default Meyers diff algorithm.
Signed-off-by: Tay Ray Chuan <rctay89@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'xdiff/xutils.h')
| -rw-r--r-- | xdiff/xutils.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/xdiff/xutils.h b/xdiff/xutils.h index d5de8292e..674a657b0 100644 --- a/xdiff/xutils.h +++ b/xdiff/xutils.h @@ -41,6 +41,8 @@ int xdl_num_out(char *out, long val); long xdl_atol(char const *str, char const **next); int xdl_emit_hunk_hdr(long s1, long c1, long s2, long c2, const char *func, long funclen, xdemitcb_t *ecb); +int xdl_fall_back_diff(xdfenv_t *diff_env, xpparam_t const *xpp, + int line1, int count1, int line2, int count2); |