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

Re: [PATCH 0/2] Fix mergetool.vimdiff.layout when "@" is used on REMOTE

From
Fernando <greenfoo@u92.eu>
Date
Mar 26, 2025, 10:10 UTC
Message-ID
<7a4d6f02-50a5-4b1b-9d19-9598e66b6f34@app.fastmail.com>
In-Reply-To
<20250325222311.400748-1-greenfoo@u92.eu>
> The problem is that it never really worked when used with "MERGED" (for all the
> others it worked fine).
Sorry, I meant "REMOTE" instead of "MERGED".

This is a typo in the cover letter. The rest of the patch series is OK.

Previous: Fernando Ramos
Message 6 of 6 in “Fix mergetool.vimdiff.layout when "@" is used on REMOTE”
  1. 0/2 Fix mergetool.vimdiff.layout when "@" is used on REMOTEFernando Ramos, Mar 25, 2025
  2. 1/2 mergetools: vimdiff: fix layout where REMOTE is the targetFernando Ramos, Mar 25, 2025
  3. D. Ben KnobleMar 29, 2025
  4. Junio C HamanoMar 29, 2025
  5. 2/2 mergetools: vimdiff: add tests for layout with REMOTE as the targetFernando Ramos, Mar 25, 2025
  6. FernandoMar 26, 2025

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.