projects / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: c2b4fae) | patch
xdl_merge(): fix an off-by-one bug
authorJohannes Schindelin <Johannes.Schindelin@gmx.de>
Wed, 29 Nov 2006 23:24:32 +0000 (00:24 +0100)
committerJunio C Hamano <junkio@cox.net>
Sun, 3 Dec 2006 01:28:19 +0000 (17:28 -0800)
commit875b8ce47650d712c8f464cfedb9147673fe3ff7
treed4f1965a16877e8b175a2c18444f2f43ed83fc97tree | snapshot
parentc2b4faea4522b28a7611ddab5eb6a5c221cc3ee5commit | diff
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>
xdiff/xmerge.c diff | blob | history
Git—the stupid content tracker