git.verplant.org Git - git.git/commit

author	Junio C Hamano <junkio@cox.net>
	Tue, 11 Apr 2006 21:34:59 +0000 (14:34 -0700)
committer	Junio C Hamano <junkio@cox.net>
	Tue, 11 Apr 2006 21:34:59 +0000 (14:34 -0700)
commit	72c159f642a33255b76fff512f2a8c3aff9f5dca
tree	6c27b0f000d16f39085c1041e28749b90f59ab8e	tree \| snapshot
parent	4da8cbc234177d6a8cf749d4ef60bd05ec843898	commit \| diff
parent	740659519e0b30bc6b64f00ba69825294c40db07	commit \| diff

Merge branch 'jc/combine' into next

* jc/combine:
combine-diff: fix hunks at the end (take #2).
combine-diff: do not lose hunks with only deletion at end.