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)
commit459d600...4fa463203d0adfc99cbf5d6fcd7edd43
tree487c0e4...c43da393f4bf6b5d915d289cd7a9b06ecopy hash to clipboard (tree)
parentdf5e12f...d405b84de07c3f2dc1afe51b1d594e2ccopy hash to clipboard (diff)
parent6ecfd91...f5ec462aeded967c9ad21912c249f96ecopy hash to clipboard (diff)
Documentation/gitattributes.txt
diff.c