Merge branch 'master' into jc/combine
* master: stripspace: make sure not to leave an incomplete line. git-commit: do not muck with commit message when no_edit is set. When showing a commit message, do not lose an incomplete line. Retire t5501-old-fetch-and-upload test.
Junio C Hamano committed
Apr 12, 2006 at 13:24 UTC
3103c005207f0840782804b9387b3a831005bb9c
No changes.