projects / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 875b8ce) | patch
xdl_merge(): fix thinko
authorJohannes Schindelin <Johannes.Schindelin@gmx.de>
Wed, 29 Nov 2006 23:25:11 +0000 (00:25 +0100)
committerJunio C Hamano <junkio@cox.net>
Sun, 3 Dec 2006 01:28:19 +0000 (17:28 -0800)
commit710daa83fc76f79b8f2ee9a765d297187c2c1aeb
tree9e3e18087e83977b4f5df6c7057d7d17a1a672e3tree | snapshot
parent875b8ce47650d712c8f464cfedb9147673fe3ff7commit | diff
xdl_merge(): fix thinko

If one side's block (of changed lines) ends later than the other
side's block, the former should be tested against the next block
of the other side, not vice versa.

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