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

Bug? I can't manually merge changes with difftool

From
Victor Porton <porton@narod.ru>
Date
Feb 16, 2021, 18:30 UTC
Message-ID
<b46fd946-42ad-2c33-0294-415949b9085e@narod.ru>
When I run
git difftool main HEAD

and manually merge changes in started meld or kdiff3 and then save the resulting file, it is saved somewhere in /tmp not in the workdir. Workdir is not modified after I close meld or kdiff3.

I need to store changes in workdir.
Is it a bug of Git 2.27.0.
Next: Jeff Hostetler
Message 1 of 2 in “Bug? I can't manually merge changes with difftool”
  1. Victor PortonFeb 16, 2021
  2. Jeff HostetlerFeb 16, 2021

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.