Andrew's git / gitweb.git / diff
?
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)
* jc/combined:
combine-diff: honour --no-commit-id
combine-diff: fix hunk_comment_line logic.
combine-diff: a few more finishing touches.

1  2 
Documentation/diff-format.txt patch | diff1 | diff2 | blob | history
diff --cc Documentation/diff-format.txt
Simple merge