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 /Documentation | |
| parent | 4da8cbc234177d6a8cf749d4ef60bd05ec843898 (diff) | |
| parent | 740659519e0b30bc6b64f00ba69825294c40db07 (diff) | |
| download | git-72c159f642a33255b76fff512f2a8c3aff9f5dca.tar.gz git-72c159f642a33255b76fff512f2a8c3aff9f5dca.tar.xz | |
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 'Documentation')
0 files changed, 0 insertions, 0 deletions