From: Junio C Hamano <junkio@cox.net>
Date: Wed, 12 Apr 2006 20:24:48 +0000 (-0700)
Subject: Merge branch 'jc/combine' into next
X-Git-Tag: v1.3.0-rc4~16
X-Git-Url: https://git.verplant.org/?a=commitdiff_plain;h=02376287ffd8b37ea7622fd4b61d654855112e75;p=git.git

Merge branch 'jc/combine' into next

* jc/combine:
  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.
  combine-diff: type fix.
---

02376287ffd8b37ea7622fd4b61d654855112e75