* [PATCH 1/4] xdl_merge(): set mode to 0 when refining conflicts
@ 2006-11-29 23:23 Johannes Schindelin
0 siblings, 0 replies; only message in thread
From: Johannes Schindelin @ 2006-11-29 23:23 UTC (permalink / raw
To: Davide Libenzi, git, junkio
mode == 0 means "conflict", and just because a conflict has been
split does not mean that the latter half is no conflict.
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
---
xdiff/xmerge.c | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/xdiff/xmerge.c b/xdiff/xmerge.c
index 04f2795..7b85aa5 100644
--- a/xdiff/xmerge.c
+++ b/xdiff/xmerge.c
@@ -228,6 +228,7 @@ static int xdl_refine_conflicts(xdfenv_t
m2->next = m->next;
m->next = m2;
m = m2;
+ m->mode = 0;
m->i1 = xscr->i1 + i1;
m->chg1 = xscr->chg1;
m->i2 = xscr->i2 + i2;
--
1.4.4.g5aac-dirty
^ permalink raw reply related [flat|nested] only message in thread
only message in thread, other threads:[~2006-11-29 23:23 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2006-11-29 23:23 [PATCH 1/4] xdl_merge(): set mode to 0 when refining conflicts Johannes Schindelin
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).