Merge branch 'jc/combined'
authorJunio C Hamano <junkio@cox.net>
Thu, 26 Oct 2006 09:07:18 +0000 (02:07 -0700)
committerJunio C Hamano <junkio@cox.net>
Thu, 26 Oct 2006 09:07:18 +0000 (02:07 -0700)
commitaf70fa4f48fdb12fef49c8bf2abc507f80081bf3
tree4911444b5861d8d71b026b41ffe34301f837693e
parente893f7ad73d387afc582d7eb063d57a88be4663d
parent44152787bcb4fd003d1f5b8c2a7591445cee8f20
Merge branch 'jc/combined'

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