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

Re: [PATCH] mergetool merge/skip/abort at prompt

From
Caleb Cushing <xenoterracide@gmail.com>
Date
Jan 28, 2009, 09:53 UTC
Message-ID
<81bfc67a0901280153v33993d73p63687c78df555b48@mail.gmail.com>
In-Reply-To
<20090128084756.GA28493@hashpling.org>
>  With this change, it would seem to be more logical to ask whether the
>  merge tool is to be run before creating the temporary files, removing
>  the need for them to be cleaned up if the answer is no. I think that
>  this would be cleaner overall.

I agree, but to be honest, I couldn't get the logic wrapped around my head, so I did it this way. refactoring does seem to be the best idea, but I don't understand enough of it yet to do so.

-- 
Caleb Cushing

http://xenoterracide.blogspot.com
Previous: Charles Bailey
Message 6 of 6 in “mergetool merge/skip/abort at prompt”
  1. mergetool merge/skip/abort at promptCaleb Cushing, Jan 28, 2009
  2. Caleb CushingJan 28, 2009
  3. David AguilarJan 28, 2009
  4. Caleb CushingJan 28, 2009
  5. Charles BaileyJan 28, 2009
  6. Caleb CushingJan 28, 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.