author | Junio C Hamano <junkio@cox.net> | |
Thu, 2 Feb 2006 13:21:14 +0000 (05:21 -0800) | ||
committer | Junio C Hamano <junkio@cox.net> | |
Thu, 2 Feb 2006 13:21:14 +0000 (05:21 -0800) | ||
commit | 823bcd6edc7f7330714486b228b052953c2f4229 | |
tree | 27a2c555fb2d97cb79256a26131a36eab2ab265c | tree | snapshot |
parent | fd4b1d2193640009c9303daa784691fc5e102018 | commit | diff |
combine-diff: fix placement of deletion.
The code misplaced a raw hunk that consists of solely deleted
lines by one line. This showed e.g. Len's 12-way octopus
(9fdb62af in the linux-2.6), kernel/power/disk.c, hunk starting
at line 95, incorrectly.
Signed-off-by: Junio C Hamano <junkio@cox.net>
The code misplaced a raw hunk that consists of solely deleted
lines by one line. This showed e.g. Len's 12-way octopus
(9fdb62af in the linux-2.6), kernel/power/disk.c, hunk starting
at line 95, incorrectly.
Signed-off-by: Junio C Hamano <junkio@cox.net>
combine-diff.c | diff | blob | history |