[prev in list] [next in list] [prev in thread] [next in thread] 

List:       git
Subject:    Re: [PATCH v5 0/1] mergetool: remove unconflicted lines
From:       Felipe Contreras <felipe.contreras () gmail ! com>
Date:       2020-12-30 22:33:55
Message-ID: 5fed0053494bd_8cde92081e () natae ! notmuch
[Download RAW message or body]

Johannes Schindelin wrote:
> On Thu, 24 Dec 2020, Junio C Hamano wrote:
> > This breakage is possibly a fallout from either this patch or
> > 1e2ae142 (t7[5-9]*: adjust the references to the default branch name
> > "main", 2020-11-18).
> >
> >   https://github.com/git/git/runs/1602803804#step:7:10358
> >
> > I cannot quite tell how the two strings compared with 'test' on
> > output line 10355 are different in the output, though.
> 
> I spent more time than I cared to spend on this, and still have not quite
> figured out what is the fault, but I can state with conviction that the
> problem is not even introduced by any merge into `seen`. The
> `fc/mergetool-automerge` branch itself is already broken:
> https://github.com/gitgitgadget/git/actions/runs/441233234

Yes, if you didn't have me blocked and read what I said a week ago in
[1], you would have saved yourself that time.

Seth House has claimed the patch series though.

[1] https://lore.kernel.org/git/5fe4bec2da21a_19c92085f@natae.notmuch/

-- 
Felipe Contreras
[prev in list] [next in list] [prev in thread] [next in thread]