diff options
| author | Junio C Hamano <junkio@cox.net> | 2006-02-02 05:21:14 -0800 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-02-02 05:21:14 -0800 |
| commit | 823bcd6edc7f7330714486b228b052953c2f4229 (patch) | |
| tree | 27a2c555fb2d97cb79256a26131a36eab2ab265c /gitMergeCommon.py | |
| parent | combine-diff: add safety check to --cc. (diff) | |
| download | git-823bcd6edc7f7330714486b228b052953c2f4229.tar.gz git-823bcd6edc7f7330714486b228b052953c2f4229.zip | |
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>
Diffstat (limited to 'gitMergeCommon.py')
0 files changed, 0 insertions, 0 deletions