diff options
| author | Junio C Hamano <junkio@cox.net> | 2006-04-11 14:34:59 -0700 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-04-11 14:34:59 -0700 |
| commit | 72c159f642a33255b76fff512f2a8c3aff9f5dca (patch) | |
| tree | 6c27b0f000d16f39085c1041e28749b90f59ab8e /commit.c | |
| parent | Merge branch 'jc/diff' into next (diff) | |
| parent | combine-diff: fix hunks at the end (take #2). (diff) | |
| download | git-72c159f642a33255b76fff512f2a8c3aff9f5dca.tar.gz git-72c159f642a33255b76fff512f2a8c3aff9f5dca.zip | |
Merge branch 'jc/combine' into next
* jc/combine:
combine-diff: fix hunks at the end (take #2).
combine-diff: do not lose hunks with only deletion at end.
Diffstat (limited to 'commit.c')
0 files changed, 0 insertions, 0 deletions