On Sat, Aug 4, 2018 at 9:57 AM Junio C Hamano <gitster@xxxxxxxxx> wrote: > > Stefan Beller <sbeller@xxxxxxxxxx> writes: > > > This builds on top of sb/range-diff-colors, which builds on js/range-diff. > > As another round of js/range-diff is expected, according to > > <nycvar.QRO.7.76.6.1808011800570.71@xxxxxxxxxxxxxxxxx> Oh right. I forgot to mention that in this cover letter, but Johannes has had work issues last week and people threw lots of stuff at him, so I concluded the resend might take a while. Hence I just put it out there in case we're happy with the status quo of that series. > I will refrain from queuing this right now. Possible conflict > resolution that won't be reusable when the base one is rerolled and > this and another topic that depend on the current round of > js/range-diff are rebased on top is not something I can spend my > time on this week. Thanks! I'll resend when appropriate. Stefan