From: Junio C Hamano <junkio@cox.net>
Date: Fri, 27 Oct 2006 01:45:52 +0000 (-0700)
Subject: Merge branch 'jc/combined' into maint
X-Git-Tag: v1.4.3.4~18
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=ac1a1f9927b01df6c50a1e29d92c6e79e2daadff;p=git.git

Merge branch 'jc/combined' into maint

* jc/combined:
  combine-diff: honour --no-commit-id
  combine-diff: fix hunk_comment_line logic.
  combine-diff: a few more finishing touches.
---

ac1a1f9927b01df6c50a1e29d92c6e79e2daadff