Merge branch 'maint' to sync with 1.6.0.1
commit49d3536594e653717844d53825fa7c0a494888f7
authorJunio C Hamano <gitster@pobox.com>
Sun, 24 Aug 2008 21:48:36 +0000 (24 14:48 -0700)
committerJunio C Hamano <gitster@pobox.com>
Sun, 24 Aug 2008 21:50:44 +0000 (24 14:50 -0700)
tree35022ab151934461b2a9f21cce140b5a773369c6
parent98fcf840af443a0a93b9a6cd1fada5af826383f3
parent5760a6b094736e6f59eb32c7abb4cdbb7fca1627
Merge branch 'maint' to sync with 1.6.0.1
Documentation/config.txt
Documentation/git.txt
Makefile
builtin-merge.c
combine-diff.c
t/t4015-diff-whitespace.sh