aboutsummaryrefslogtreecommitdiffstats
path: root/userdiff.h
diff options
context:
space:
mode:
Diffstat (limited to 'userdiff.h')
-rw-r--r--userdiff.h8
1 files changed, 7 insertions, 1 deletions
diff --git a/userdiff.h b/userdiff.h
index 24419db697..7565930337 100644
--- a/userdiff.h
+++ b/userdiff.h
@@ -11,13 +11,19 @@ struct userdiff_funcname {
int cflags;
};
+struct external_diff {
+ char *cmd;
+ unsigned trust_exit_code:1;
+};
+
struct userdiff_driver {
const char *name;
- const char *external;
+ struct external_diff external;
const char *algorithm;
int binary;
struct userdiff_funcname funcname;
const char *word_regex;
+ const char *word_regex_multi_byte;
const char *textconv;
struct notes_cache *textconv_cache;
int textconv_want_cache;