{"thread":{"id":"43735","subject":"[PATCH 1/4] xdl_merge(): set mode to 0 when refining conflicts","startedAt":"2006-11-29T23:23:31Z","lastAt":"2006-11-29T23:23:31Z","messageCount":1,"participants":["Johannes Schindelin"],"isPatch":true,"patchVersion":1,"patchTotal":4},"messages":[{"id":"297556","messageId":"Pine.LNX.4.63.0611300021490.30004@wbgn013.biozentrum.uni-wuerzburg.de","threadId":"43735","inReplyTo":null,"subject":"[PATCH 1/4] xdl_merge(): set mode to 0 when refining conflicts","fromName":"Johannes Schindelin","fromEmail":"johannes.schindelin@gmx.de","sentAt":"2006-11-29T23:23:31Z","receivedAt":"2006-11-29T23:23:31Z","isPatch":true,"sender":{"key":"johannes.schindelin@gmx.de","avatar":"https://avatars.githubusercontent.com/u/127790?v=4"},"body":"\nmode == 0 means \"conflict\", and just because a conflict has been\nsplit does not mean that the latter half is no conflict.\n\nSigned-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>\n\n---\n xdiff/xmerge.c |    1 +\n 1 files changed, 1 insertions(+), 0 deletions(-)\n\ndiff --git a/xdiff/xmerge.c b/xdiff/xmerge.c\nindex 04f2795..7b85aa5 100644\n--- a/xdiff/xmerge.c\n+++ b/xdiff/xmerge.c\n@@ -228,6 +228,7 @@ static int xdl_refine_conflicts(xdfenv_t\n \t\t\tm2->next = m->next;\n \t\t\tm->next = m2;\n \t\t\tm = m2;\n+\t\t\tm->mode = 0;\n \t\t\tm->i1 = xscr->i1 + i1;\n \t\t\tm->chg1 = xscr->chg1;\n \t\t\tm->i2 = xscr->i2 + i2;\n-- \n1.4.4.g5aac-dirty\n"}]}