]> git.ipfire.org Git - thirdparty/git.git/commit
projects / thirdparty / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: df5e12f 6ecfd91)
Merge branch 'jk/diff-convfilter-test-fix'
authorJunio C Hamano <gitster@pobox.com>
Thu, 13 Nov 2008 05:50:41 +0000 (21:50 -0800)
committerJunio C Hamano <gitster@pobox.com>
Thu, 13 Nov 2008 05:50:41 +0000 (21:50 -0800)
commit459d60084fa463203d0adfc99cbf5d6fcd7edd43
tree487c0e47c43da393f4bf6b5d915d289cd7a9b06etree | snapshot
parentdf5e12f7d405b84de07c3f2dc1afe51b1d594e2ccommit | diff
parent6ecfd91df5ec462aeded967c9ad21912c249f96ecommit | 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
Documentation/gitattributes.txt diff1 | diff2 | blob | history
diff.c diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.