From: Bert Wesarg Date: Fri, 19 Nov 2010 11:48:17 GMT Subject: Re: [PATCHv2 1/2] git-gui: respect conflict marker size Message-ID: In-Reply-To: <87k4k9h858.fsf@fox.patthoyts.tk> On Fri, Nov 19, 2010 at 12:20, Pat Thoyts 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