Hi,
On Fri, 29 Aug 2008, Junio C Hamano wrote:
> diff --git a/xdiff/xmerge.c b/xdiff/xmerge.c
> index 29cdbea..7dcd405 100644
> --- a/xdiff/xmerge.c
> +++ b/xdiff/xmerge.c
> @@ -427,7 +427,7 @@ static int xdl_do_merge(xdfenv_t *xe1, xdchange_t *xscr1, const char *name1,
> xscr2 = xscr2->next;
> continue;
> }
> - if (level < 1 || xscr1->i1 != xscr2->i1 ||
> + if (level == XDL_MERGE_MINIMAL || xscr1->i1 != xscr2->i1 ||
Yeah, okay, sorry.
> @@ -449,12 +449,11 @@ static int xdl_do_merge(xdfenv_t *xe1, xdchange_t *xscr1, const char *name1,
> chg0 = xscr1->i1 + xscr1->chg1 - i0;
> chg1 = xscr1->i2 + xscr1->chg2 - i1;
> chg2 = xscr2->i2 + xscr2->chg2 - i2;
> - if (ffo > 0)
> - chg2 += ffo;
> - else {
> + if (ffo < 0) {
> chg0 -= ffo;
> chg1 -= ffo;
> - }
> + } else
> + chg2 += ffo;
I do not understand why the order was changed, but hey, I do not care that
deeply.
Ciao,
Dscho
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
