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

1  2 
combine-diff.c
diff --cc combine-diff.c
Simple merge