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

Re: [PATCH] Quick and dirty mergetool fix - take 2

From
Charles Bailey <charles@hashpling.org>
Date
Jan 30, 2009, 16:18 UTC
Message-ID
<20090130161850.GB26321@hashpling.org>
In-Reply-To
<1233332166-14300-1-git-send-email-charles@hashpling.org>
On Fri, Jan 30, 2009 at 04:16:06PM +0000, Charles Bailey wrote:
Sorry, I meant to add this comment to the last patch.

I have a test so I'm more confident about this version. It's not signed off yet as I want to clean up the new test and make sure I've considered everything - well more things - but it should at least work now.

-- 
Charles Bailey
http://ccgi.hashpling.plus.com/blog/
Previous: Charles BaileyNext: Jonas Flodén
Message 7 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.