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

Re: [PATCH] Quick and dirty mergetool fix

From
JFJonas Flodén <jonas.floden@gmail.com>
Date
Jan 30, 2009, 16:00 UTC
Message-ID
<4983241B.6020208@gmail.com>
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
Previous: Charles BaileyNext: Charles Bailey
Message 5 of 8 in “git mergetool from next not working in subdirectory”
  1. Jonas FlodénJan 30, 2009
  2. Johannes GilgerJan 30, 2009
  3. Charles BaileyJan 30, 2009
  4. Quick and dirty mergetool fixCharles Bailey, Jan 30, 2009
  5. Jonas FlodénJan 30, 2009
  6. Quick and dirty mergetool fix - take 2Charles Bailey, Jan 30, 2009
  7. Charles BaileyJan 30, 2009
  8. Jonas FlodénJan 30, 2009

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.