From: Junio C Hamano <junkio@cox.net>
Date: Thu, 26 Oct 2006 09:07:18 +0000 (-0700)
Subject: Merge branch 'jc/combined'
X-Git-Tag: v1.4.4-rc1~63
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=af70fa4f48fdb12fef49c8bf2abc507f80081bf3;p=git.git

Merge branch 'jc/combined'

* jc/combined:
  combine-diff: honour --no-commit-id
  combine-diff: fix hunk_comment_line logic.
---

af70fa4f48fdb12fef49c8bf2abc507f80081bf3