Bug? I can't manually merge changes with difftool

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Subject: Bug? I can't manually merge changes with difftool
From: Victor Porton <porton@xxxxxxxx>
Date: Tue, 16 Feb 2021 20:30:20 +0200
User-agent: Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101 Thunderbird/78.6.1

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.

Follow-Ups:
- Re: Bug? I can't manually merge changes with difftool
  - From: Jeff Hostetler

Prev by Date: Re: [PATCH v2 12/27] userdiff tests: rewrite hunk header test infrastructure
Next by Date: Re: [PATCH 1/1] mergetools/vimdiff: add vimdiff1 merge tool variant
Previous by thread: Git in GSoC 2021 ?
Next by thread: Re: Bug? I can't manually merge changes with difftool
Index(es):
- Date
- Thread

[Index of Archives] [Linux Kernel Development] [Gcc Help] [IETF Annouce] [DCCP] [Netdev] [Networking] [Security] [V4L] [Bugtraq] [Yosemite] [MIPS Linux] [ARM Linux] [Linux Security] [Linux RAID] [Linux SCSI] [Fedora Users]

Powered by Linux