summaryrefslogtreecommitdiff
path: root/xdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2008-11-13 05:50:58 (GMT)
committerJunio C Hamano <gitster@pobox.com>2008-11-13 05:50:58 (GMT)
commit72b6157aa847615a778ac9950e87dde109afa50c (patch)
tree691238c7db13ab8a743807731a44e3c493973c25 /xdiff
parent459d60084fa463203d0adfc99cbf5d6fcd7edd43 (diff)
parenta79b8b6623288f7d5409ad749cc6553976a4f0e8 (diff)
downloadgit-72b6157aa847615a778ac9950e87dde109afa50c.zip
git-72b6157aa847615a778ac9950e87dde109afa50c.tar.gz
git-72b6157aa847615a778ac9950e87dde109afa50c.tar.bz2
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 'xdiff')
0 files changed, 0 insertions, 0 deletions