Code

Merge branch 'master' into jc/combine
authorJunio C Hamano <junkio@cox.net>
Wed, 12 Apr 2006 20:24:04 +0000 (13:24 -0700)
committerJunio C Hamano <junkio@cox.net>
Wed, 12 Apr 2006 20:24:04 +0000 (13:24 -0700)
* 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.


Trivial merge