diff options
| author | Junio C Hamano <gitster@pobox.com> | 2008-11-12 21:50:41 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-11-12 21:50:41 -0800 |
| commit | 459d60084fa463203d0adfc99cbf5d6fcd7edd43 (patch) | |
| tree | 487c0e47c43da393f4bf6b5d915d289cd7a9b06e /rerere.c | |
| parent | df5e12f7d405b84de07c3f2dc1afe51b1d594e2c (diff) | |
| parent | 6ecfd91df5ec462aeded967c9ad21912c249f96e (diff) | |
| download | git-459d60084fa463203d0adfc99cbf5d6fcd7edd43.tar.gz git-459d60084fa463203d0adfc99cbf5d6fcd7edd43.tar.xz | |
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
Diffstat (limited to 'rerere.c')
0 files changed, 0 insertions, 0 deletions