![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Junio C Hamano <gitster@pobox.com> | |
| Sun, 24 Aug 2008 21:48:36 +0000 (14:48 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Sun, 24 Aug 2008 21:50:44 +0000 (14:50 -0700) | ||
| commit | 49d3536594e653717844d53825fa7c0a494888f7 | |
| tree | 35022ab151934461b2a9f21cce140b5a773369c6 | tree | snapshot |
| parent | 98fcf840af443a0a93b9a6cd1fada5af826383f3 | commit | diff |
| parent | 5760a6b094736e6f59eb32c7abb4cdbb7fca1627 | commit | diff |
Merge branch 'maint' to sync with 1.6.0.1
| Documentation/config.txt | diff1 | | diff2 | | blob | history |
| Documentation/git.txt | diff1 | | diff2 | | blob | history |
| Makefile | diff1 | | diff2 | | blob | history |
| builtin-merge.c | diff1 | | diff2 | | blob | history |
| combine-diff.c | diff1 | | diff2 | | blob | history |
| t/t4015-diff-whitespace.sh | diff1 | | diff2 | | blob | history |