Merge branch 'jc/combined' into maint
authorJunio C Hamano <junkio@cox.net>
Fri, 27 Oct 2006 01:45:52 +0000 (18:45 -0700)
committerJunio C Hamano <junkio@cox.net>
Fri, 27 Oct 2006 01:45:52 +0000 (18:45 -0700)
commitac1a1f9927b01df6c50a1e29d92c6e79e2daadff
tree06475e2ffc028329193d2f0227033072fa54c57c
parentfb8e23fae2ac9af831260079b14eabad316f3769
parent44152787bcb4fd003d1f5b8c2a7591445cee8f20
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.
Documentation/diff-format.txt