Re: [Issue 2950] New - Weird prompting to resolve conflicts when EDITOR is not defined

On 10/3/07, Ben Collins-Sussman <sussman@red-bean.com> wrote:
> On 10/3/07, Mark Phippard <markphip@gmail.com> wrote:
> > On 10/3/07, Erik Huelsmann <ehuels@gmail.com> wrote:
> > > On 10/3/07, Ben Collins-Sussman <sussman@red-bean.com> wrote:
> > > > On 10/2/07, Mark Phippard <markphip@gmail.com> wrote:
> > > > > Did you try this on your Mac? I get the same behavior as Augie when I
> > > > > try this on OSX. I'll be happy to try it again after the patch is
> > > > > committed.
> > > >
> > > > Yes, this is a transcript from my Mac.
> > >
> > > Are you all using recent/current trunk versions? Could anything have
> > > happened in the mean time?
> >
> > Did a HEAD build last night and I still get it on OSX.
>
> I still can't reproduce on my Mac, using HEAD. Can you apply dlr's
> proposed patch, see if it fixes the problem?

I applied Dan's patch and I still have the problem. Other than
changing the colors, I am just using the default OSX terminal.

-- 
Thanks
Mark Phippard
http://markphip.blogspot.com/
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org