tree 487c0e47c43da393f4bf6b5d915d289cd7a9b06e
parent df5e12f7d405b84de07c3f2dc1afe51b1d594e2c
parent 6ecfd91df5ec462aeded967c9ad21912c249f96e
author Junio C Hamano <gitster@pobox.com> 1226555441 -0800
committer Junio C Hamano <gitster@pobox.com> 1226555441 -0800

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