Junio C Hamano 72b6157aa8 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

2008-11-12 21:50:58 -08:00

88 KiB

Raw Blame History

View Raw