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

Re: Mergetool generating blank files (1.5.3)

From
Junio C Hamano <gitster@pobox.com>
Date
Sep 27, 2007, 20:28 UTC
Message-ID
<7vd4w3ua2j.fsf@gitster.siamese.dyndns.org>
In-Reply-To
<94ccbe710709271312k7eac8e35y353180596a0abc9a@mail.gmail.com>
"Kelvie Wong" <kelvie@ieee.org> writes:
> And then meld starts up, with the original file in the middle, and two
> blank files on the side, LOCAL and REMOTE respectively.

Wild guess. Are you running this from a subdirectory? I have a mild suspicion that mergetool is not subdirectory safe. Can you try running it from the toplevel of the work tree?

Previous: Kelvie WongNext: Kelvie Wong
Message 15 of 28 in “Mergetool generating blank files (1.5.3)”
  1. Kelvie WongSep 27, 2007
  2. Pierre HabouzitSep 27, 2007
  3. Russ BrownSep 27, 2007
  4. Pierre HabouzitSep 27, 2007
  5. Theodore TsoSep 27, 2007
  6. Pierre HabouzitSep 27, 2007
  7. Peter BaumannSep 28, 2007
  8. Pierre HabouzitSep 28, 2007
  9. Jeff KingSep 27, 2007
  10. Pierre HabouzitSep 27, 2007
  11. Jeff KingSep 27, 2007
  12. Kelvie WongSep 27, 2007
  13. Junio C HamanoSep 27, 2007
  14. Kelvie WongSep 27, 2007
  15. Junio C HamanoSep 27, 2007
  16. Kelvie WongSep 27, 2007
  17. Junio C HamanoSep 27, 2007
  18. Junio C HamanoSep 27, 2007
  19. Kelvie WongSep 27, 2007
  20. Kelvie WongSep 27, 2007
  21. Junio C HamanoSep 27, 2007
  22. Junio C HamanoSep 27, 2007
  23. Kelvie WongSep 27, 2007
  24. Theodore TsoSep 27, 2007
  25. Kelvie WongSep 28, 2007
  26. David KastrupSep 28, 2007
  27. Theodore TsoSep 27, 2007
  28. David KågedalSep 28, 2007

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.