Re: svn commit: r30919 - trunk/subversion/svn

On Fri, May 2, 2008 at 2:01 PM, Karl Fogel <kfogel_at_red-bean.com> wrote:
> "David Glasser" <glasser_at_davidglasser.net> writes:
>
> > OK, but I'd want to then add "ignoring merged file" to all three
> > -conflict lines. I had that originally, but it was both
>
> [sentence cut off early?]
>
> Sure, I tihnk anything that makes the individual item descriptions
> clearer or more precise is good.

Karl and I talked on IRC after this. I have some fixes here,
including one to save a ".edited" file if the user uses an (e)dit
command and then chooses one of the [mt][cf] options; they're on my
laptop and I'll commit them Monday.

--dave

-- 
David Glasser | glasser@davidglasser.net | http://www.davidglasser.net/
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe_at_subversion.tigris.org
For additional commands, e-mail: dev-help_at_subversion.tigris.org