git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: Changed diff3 view from 2.36 → 2.67 for vimdiff

From
Fernando Ramos <greenfoo@u92.eu>
Date
Jul 25, 2022, 20:43 UTC
Message-ID
<Yt8AfljwGc6a95Sv@zacax395.localdomain>
In-Reply-To
<7dc225d7-eb36-9fb8-5977-6913ac4dd007@web.de>
Show 6 quoted lines
> 
> After successfully compiling Git, I'm almost ashamed to ask, but I was NOT
> able to run the vim command you suggested, Fernando:
> 
> vim -c "echo | split | vertical split | 1b | wincmd l | vertical split | 2b | wincmd l | 3b | wincmd j | 4b | tabdo windo diffthis" -c "tabfirst" local.txt base.txt remote.txt merged.txt
> 
Hi Claudio,

Notice that this command was meant to be executed *directly* from the terminal (and not from .gitconfig).

It just opens 4 files that, as you noted, do not exist... but that's ok with vim: it will open 4 buffers named after the provided filenames and only save them to disk when running ":w".

The result should be something like what is shown in [1], ie. 4 empty buffers named "local", "base", "remote" and "merged" shown with the expected layout.

Hope this helps!
Fernando.
[1] https://postimg.cc/dL8G2mng
Previous: Claudio Ebel
Message 5 of 5 in “Changed diff3 view from 2.36 → 2.67 for vimdiff”
  1. Claudio EbelJul 22, 2022
  2. Martin ÅgrenJul 22, 2022
  3. Fernando RamosJul 22, 2022
  4. Claudio EbelJul 24, 2022
  5. Fernando RamosJul 25, 2022

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.