From: Victor Porton <porton@narod.ru>
To: git@vger.kernel.org
Subject: Bug? I can't manually merge changes with difftool
Date: Tue, 16 Feb 2021 20:30:20 +0200 [thread overview]
Message-ID: <b46fd946-42ad-2c33-0294-415949b9085e@narod.ru> (raw)
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 reply other threads:[~2021-02-16 18:42 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-02-16 18:30 Victor Porton [this message]
2021-02-16 18:54 ` Bug? I can't manually merge changes with difftool Jeff Hostetler
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=b46fd946-42ad-2c33-0294-415949b9085e@narod.ru \
--to=porton@narod.ru \
--cc=git@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).