![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Junio C Hamano <gitster@pobox.com> | |
| Thu, 13 Nov 2008 05:50:41 +0000 (21:50 -0800) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Thu, 13 Nov 2008 05:50:41 +0000 (21:50 -0800) | ||
| commit | 459d60084fa463203d0adfc99cbf5d6fcd7edd43 | |
| tree | 487c0e47c43da393f4bf6b5d915d289cd7a9b06e | tree | snapshot |
| parent | df5e12f7d405b84de07c3f2dc1afe51b1d594e2c | commit | diff |
| parent | 6ecfd91df5ec462aeded967c9ad21912c249f96e | commit | diff |
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
* 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
| Documentation/gitattributes.txt | diff1 | | diff2 | | blob | history |
| diff.c | diff1 | | diff2 | | blob | history |