Bug? I can't manually merge changes with difftool

Victor Porton· Feb 16, 2021, 18:30 UTC · lore

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.

Jeff Hostetler· Feb 16, 2021, 18:54 UTC · re: Victor Porton · lore

Re: Bug? I can't manually merge changes with difftool

On 2/16/21 1:30 PM, Victor Porton wrote:

Show 12 quoted lines

> 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.
>

When you give it two branches or refs, it does a "historical" diff between those two versions. If you omit "HEAD" from the command line, it will diff your "main" branch against the live version in your worktree.

Jeff