![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Junio C Hamano <junkio@cox.net> | |
| Thu, 26 Oct 2006 09:07:18 +0000 (02:07 -0700) | ||
| committer | Junio C Hamano <junkio@cox.net> | |
| Thu, 26 Oct 2006 09:07:18 +0000 (02:07 -0700) | ||
| commit | af70fa4f48fdb12fef49c8bf2abc507f80081bf3 | |
| tree | 4911444b5861d8d71b026b41ffe34301f837693e | tree | snapshot |
| parent | e893f7ad73d387afc582d7eb063d57a88be4663d | commit | diff |
| parent | 44152787bcb4fd003d1f5b8c2a7591445cee8f20 | commit | diff |
Merge branch 'jc/combined'
* jc/combined:
combine-diff: honour --no-commit-id
combine-diff: fix hunk_comment_line logic.
* jc/combined:
combine-diff: honour --no-commit-id
combine-diff: fix hunk_comment_line logic.
| combine-diff.c | diff1 | | diff2 | | blob | history |