Johannes Schindelin <Johannes.Schindelin@xxxxxx> writes: > Hi Junio, > > On Sun, 8 Jan 2017, Junio C Hamano wrote: > >> * js/difftool-builtin (2017-01-08) 4 commits >> - t7800: run both builtin and scripted difftool, for now >> - difftool: implement the functionality in the builtin >> - difftool: add a skeleton for the upcoming builtin >> - git_exec_path: avoid Coverity warning about unfree()d result >> >> Rewrite a scripted porcelain "git difftool" in C. >> >> What's the doneness of this topic? > > There was only one bug report since the first iteration, and it has been > fixed as of v4. This is more RFH than FYI, but some topics in flight add more tests to t7800 and with everything merged, the test breaks at the tip of 'pu' as of tonight (eh, technically last night, as I ended up not sleeping due to jetlag), even though each individual topic passes it. It _might_ indicate a problem with this topic, or it may merely be a biproduct of a mismerge.