From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 13 Nov 2008 05:50:58 +0000 (-0800)
Subject: Merge branch 'jk/diff-convfilter'
X-Git-Tag: v1.6.1-rc1~62
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=72b6157aa847615a778ac9950e87dde109afa50c;p=git.git

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
---

72b6157aa847615a778ac9950e87dde109afa50c
diff --cc t/t4030-diff-textconv.sh
index 3aed1bbdf,09967f566..03ba26a0d
--- a/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 &&