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 /merge-recursive.c | |
| 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 'merge-recursive.c')
0 files changed, 0 insertions, 0 deletions