| commit | 875b8ce47650d712c8f464cfedb9147673fe3ff7 | |
| author | Johannes Schindelin <Johannes.Schindelin@gmx.de> | |
| Wed, 29 Nov 2006 23:24:32 +0000 (30 00:24 +0100) | ||
| committer | Junio C Hamano <junkio@cox.net> | |
| Sun, 3 Dec 2006 01:28:19 +0000 (2 17:28 -0800) | ||
| tree | d4f1965a16877e8b175a2c18444f2f43ed83fc97 | treesnapshot (tar.gz zip) |
| parent | c2b4faea4522b28a7611ddab5eb6a5c221cc3ee5 | commitdiff |
xdl_merge(): fix an off-by-one bug
The line range is i1 .. (i1 + chg1 - 1), not i1 .. (i1 + chg1).
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <junkio@cox.net>
The line range is i1 .. (i1 + chg1 - 1), not i1 .. (i1 + chg1).
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <junkio@cox.net>
| xdiff/xmerge.c | diffblobblamehistory |