{"thread":{"id":"43772","subject":"[PATCH 4/4] xdl_merge(): fix thinko","startedAt":"2006-11-29T23:25:11Z","lastAt":"2006-11-29T23:25:11Z","messageCount":1,"participants":["Johannes Schindelin"],"isPatch":true,"patchVersion":1,"patchTotal":4},"messages":[{"id":"298425","messageId":"Pine.LNX.4.63.0611300024350.30004@wbgn013.biozentrum.uni-wuerzburg.de","threadId":"43772","inReplyTo":null,"subject":"[PATCH 4/4] xdl_merge(): fix thinko","fromName":"Johannes Schindelin","fromEmail":"johannes.schindelin@gmx.de","sentAt":"2006-11-29T23:25:11Z","receivedAt":"2006-11-29T23:25:11Z","isPatch":true,"sender":{"key":"johannes.schindelin@gmx.de","avatar":"https://avatars.githubusercontent.com/u/127790?v=4"},"body":"\nIf one side's block (of changed lines) ends later than the other\nside's block, the former should be tested against the next block\nof the other side, not vice versa.\n\nSigned-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>\n---\n xdiff/xmerge.c |    4 ++--\n 1 files changed, 2 insertions(+), 2 deletions(-)\n\ndiff --git a/xdiff/xmerge.c b/xdiff/xmerge.c\nindex 9fe2059..6d4f9b6 100644\n--- a/xdiff/xmerge.c\n+++ b/xdiff/xmerge.c\n@@ -318,13 +318,13 @@ static int xdl_do_merge(xdfenv_t *xe1, x\n \t\t\txscr1->i1 = i2;\n \t\t\txscr1->i2 += xscr1->chg2;\n \t\t\txscr1->chg2 = 0;\n-\t\t\txscr1 = xscr1->next;\n+\t\t\txscr2 = xscr2->next;\n \t\t} else if (i2 > i1) {\n \t\t\txscr2->chg1 -= i2 - i1;\n \t\t\txscr2->i1 = i1;\n \t\t\txscr2->i2 += xscr2->chg2;\n \t\t\txscr2->chg2 = 0;\n-\t\t\txscr2 = xscr2->next;\n+\t\t\txscr1 = xscr1->next;\n \t\t} else {\n \t\t\txscr1 = xscr1->next;\n \t\t\txscr2 = xscr2->next;\n-- \n1.4.4.g5aac-dirty\n"}]}