Junio C Hamano 459d60084f Merge branch 'jk/diff-convfilter-test-fix' ...

* jk/diff-convfilter-test-fix:
  Avoid using non-portable `echo -n` in tests.
  add userdiff textconv tests
  document the diff driver textconv feature
  diff: add missing static declaration

Conflicts:
	Documentation/gitattributes.txt

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

20 KiB

Raw Blame History

View Raw