Hi Max, On Sun, 29 Jun 2014, Max Kirillov wrote:
> diff --git a/xdiff/xmerge.c b/xdiff/xmerge.c > index 9e13b25..625198e 100644 > --- a/xdiff/xmerge.c > +++ b/xdiff/xmerge.c > @@ -245,11 +245,11 @@ static int xdl_fill_merge_buffer(xdfenv_t *xe1, const > char *name1, > dest ? dest + size : NULL); > /* Postimage from side #1 */ > if (m->mode & 1) > - size += xdl_recs_copy(xe1, m->i1, m->chg1, 1, > + size += xdl_recs_copy(xe1, m->i1, m->chg1, > (m->mode & 2), > dest ? dest + size : > NULL); > /* Postimage from side #2 */ > if (m->mode & 2) > - size += xdl_recs_copy(xe2, m->i2, m->chg2, 1, > + size += xdl_recs_copy(xe2, m->i2, m->chg2, 0, > dest ? dest + size : > NULL); > } else > continue; Makes sense to me, especially with the nice explanation in the commit message. I just wish the tests were a little easier to understand... It is probably my fault because I insisted on using a text that has *nothing* to do with Git. These days, I would probably have used better file names and would have used file contents that reflect the purpose in the tests (i.e. a line saying "This line ends with a carriage return" or some such). Having said that, here is my ACK for the current revision of the patch series (because I know how much work it would be to fix the issue I described above, and it is an *entirely different* issue from the one you fixed with this series, too). Ciao, Dscho -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
