diff options
| author | Junio C Hamano <gitster@pobox.com> | 2008-02-27 11:57:19 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-02-27 11:57:19 -0800 |
| commit | cb99be7c7d2afc71106ffaf400c769c8e72f1bb2 (patch) | |
| tree | 66a78ff99d45bf4c9c1dba5867c48c08b0b44df5 /xdiff/xdiff.h | |
| parent | 722f53ca2feed5e41c2270fdaae25bde5b7582f4 (diff) | |
| parent | ee95ec5d58d536243966de6ee810d345074b755e (diff) | |
| download | git-cb99be7c7d2afc71106ffaf400c769c8e72f1bb2.tar.gz | |
Merge branch 'js/merge'
* js/merge:
xdl_merge(): introduce XDL_MERGE_ZEALOUS_ALNUM
xdl_merge(): make XDL_MERGE_ZEALOUS output simpler
Diffstat (limited to 'xdiff/xdiff.h')
| -rw-r--r-- | xdiff/xdiff.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/xdiff/xdiff.h b/xdiff/xdiff.h index c00ddaa6e9..413082e1fd 100644 --- a/xdiff/xdiff.h +++ b/xdiff/xdiff.h @@ -53,6 +53,7 @@ extern "C" { #define XDL_MERGE_MINIMAL 0 #define XDL_MERGE_EAGER 1 #define XDL_MERGE_ZEALOUS 2 +#define XDL_MERGE_ZEALOUS_ALNUM 3 typedef struct s_mmfile { char *ptr; |