diff options
author | Junio C Hamano <gitster@pobox.com> | 2008-11-12 21:50:58 -0800 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2008-11-12 21:50:58 -0800 |
commit | 72b6157aa847615a778ac9950e87dde109afa50c (patch) | |
tree | 691238c7db13ab8a743807731a44e3c493973c25 /diff.h | |
parent | Merge branch 'jk/diff-convfilter-test-fix' (diff) | |
parent | enable textconv for diff in verbose status/commit (diff) | |
download | tgif-72b6157aa847615a778ac9950e87dde109afa50c.tar.xz |
Merge branch 'jk/diff-convfilter'
* jk/diff-convfilter:
enable textconv for diff in verbose status/commit
wt-status: load diff ui config
only textconv regular files
userdiff: require explicitly allowing textconv
refactor userdiff textconv code
Conflicts:
t/t4030-diff-textconv.sh
Diffstat (limited to 'diff.h')
-rw-r--r-- | diff.h | 1 |
1 files changed, 1 insertions, 0 deletions
@@ -65,6 +65,7 @@ typedef void (*diff_format_fn_t)(struct diff_queue_struct *q, #define DIFF_OPT_IGNORE_SUBMODULES (1 << 18) #define DIFF_OPT_DIRSTAT_CUMULATIVE (1 << 19) #define DIFF_OPT_DIRSTAT_BY_FILE (1 << 20) +#define DIFF_OPT_ALLOW_TEXTCONV (1 << 21) #define DIFF_OPT_TST(opts, flag) ((opts)->flags & DIFF_OPT_##flag) #define DIFF_OPT_SET(opts, flag) ((opts)->flags |= DIFF_OPT_##flag) #define DIFF_OPT_CLR(opts, flag) ((opts)->flags &= ~DIFF_OPT_##flag) |