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

diff --cc builtin-diff.c
Simple merge

diff --cc diff.c
Simple merge

diff --cc t/t4030-diff-textconv.sh
index 3aed1bbdfed0f415a615f77c72210336d83f33ed,09967f56639035d12c5211d56e82ef2ef51e512d..03ba26a0de7d1bf41269cfb1f1b9f33b733482e1
--- 1/t/t4030-diff-textconv.sh
--- 2/t/t4030-diff-textconv.sh
+++ b/t/t4030-diff-textconv.sh
@@@ -104,8 -112,8 +112,8 @@@ index ad8b3d2..67be42
  \ No newline at end of file
  EOF
  # make a symlink the hard way that works on symlink-challenged file systems
- test_expect_failure 'textconv does not act on symlinks' '
+ test_expect_success 'textconv does not act on symlinks' '
 -      echo -n frotz > file &&
 +      printf frotz > file &&
        git add file &&
        git ls-files -s | sed -e s/100644/120000/ |
                git update-index --index-info &&