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

Re: [PATCHv2 1/2] git-gui: respect conflict marker size

From
Bert Wesarg <bert.wesarg@googlemail.com>
Date
Nov 19, 2010, 11:48 UTC
Message-ID
<AANLkTimSU9RfFNpXi3u7BN+eFGBSOaPXS4OOfDmwYaDB@mail.gmail.com>
In-Reply-To
<87k4k9h858.fsf@fox.patthoyts.tk>

On Fri, Nov 19, 2010 at 12:20, Pat Thoyts <patthoyts@users.sourceforge.net> wrote:

> Tcl doesn't expand variables in curly-braced expressions so the
> $conflict_size is left in there verbatim.

I should have noticed it either by testing or by wondering why i didn't need to escape the '$', which I have tested but with a verbatim 7 as the conflict_size in the regex.

Thanks for fixing.
Bert
Previous: Pat Thoyts
Message 11 of 11 in “git-gui: respect conflict marker size”
  1. git-gui: respect conflict marker sizeBert Wesarg, Nov 16, 2010
  2. 1/2 git-gui: respect conflict marker sizeBert Wesarg, Nov 16, 2010
  3. 2/2 git-gui: support for diff3 conflict styleBert Wesarg, Nov 16, 2010
  4. Pat ThoytsNov 19, 2010
  5. Bert WesargNov 19, 2010
  6. Bert WesargFeb 27, 2011
  7. 2/2 git-gui: support for diff3 conflict styleBert Wesarg, Mar 30, 2011
  8. git-gui: support for diff3 conflict styleBert Wesarg, Mar 30, 2011
  9. Bert WesargOct 20, 2011
  10. Pat ThoytsNov 19, 2010
  11. Bert WesargNov 19, 2010

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.