git notes merge: Manual conflict resolution, part 1/2
[git/jnareb-git.git] / userdiff.h
blob942d5949501027fb5d30e0d59629aab38fd2669a
1 #ifndef USERDIFF_H
2 #define USERDIFF_H
4 #include "notes-cache.h"
6 struct userdiff_funcname {
7 const char *pattern;
8 int cflags;
9 };
11 struct userdiff_driver {
12 const char *name;
13 const char *external;
14 int binary;
15 struct userdiff_funcname funcname;
16 const char *word_regex;
17 const char *textconv;
18 struct notes_cache *textconv_cache;
19 int textconv_want_cache;
22 int userdiff_config(const char *k, const char *v);
23 struct userdiff_driver *userdiff_find_by_name(const char *name);
24 struct userdiff_driver *userdiff_find_by_path(const char *path);
26 #endif /* USERDIFF */