From: "Jonas Flodén" <jonas.floden@gmail.com>
To: Charles Bailey <charles@hashpling.org>
Cc: git@vger.kernel.org
Subject: Re: [PATCH] Quick and dirty mergetool fix
Date: Fri, 30 Jan 2009 17:00:27 +0100 [thread overview]
Message-ID: <4983241B.6020208@gmail.com> (raw)
In-Reply-To: <1233325351-31496-1-git-send-email-charles@hashpling.org>
Hmm, with that patch I get get this instead:
mv: cannot stat `.merge_file_Yg2IIs': No such file or directory
mv: cannot stat `.merge_file_4xGT8t': No such file or directory
mv: cannot stat `.merge_file_4XAVAt': No such file or directory
Which seems to be a problem in checkout_staged_file()
The .merge_file_* files exists in the repository root (the dir with
.git) but I don't know how to fix that..
Thanks!
// Jonas
next prev parent reply other threads:[~2009-01-30 16:01 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-01-30 13:05 git mergetool from next not working in subdirectory Jonas Flodén
2009-01-30 13:50 ` Johannes Gilger
2009-01-30 14:06 ` Charles Bailey
2009-01-30 14:22 ` [PATCH] Quick and dirty mergetool fix Charles Bailey
2009-01-30 16:00 ` Jonas Flodén [this message]
2009-01-30 16:16 ` [PATCH] Quick and dirty mergetool fix - take 2 Charles Bailey
2009-01-30 16:18 ` Charles Bailey
2009-01-30 16:22 ` Jonas Flodén
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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=4983241B.6020208@gmail.com \
--to=jonas.floden@gmail.com \
--cc=charles@hashpling.org \
--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.
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 NNTP newsgroup(s).