On Sat, Aug 6, 2022 at 1:38 PM Fernando Ramos <greenfoo@xxxxxx> wrote: > > vimdiff3 was introduced in 7c147b77d3 (mergetools: add vimdiff3 mode, > 2014-04-20) and then partially broken in 0041797449 (vimdiff: new > implementation with layout support, 2022-03-30) in two ways: > > - It does not show colors unless the user has "set hidden" in his > .vimrc file > > - It prompts the user to "Press ENTER" every time it runs. > > This patch fixes both issues by adding "set hidden" and "silent" to the > generated command string that is used to run vim. Although I don't see the point of the extra complexity in the case of a single window, especially since it doesn't really work for anything other than "MERGED", this does make vimdiff3 work again for me. Tested-by: Felipe Contreras <felipe.contreras@xxxxxxxxx> -- Felipe Contreras
