[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

Re: Merge notification 'U' for interactive resolution - not 'G'?

From: Julian Foad <julianfoad_at_btopenworld.com>
Date: Fri, 15 Aug 2008 02:20:00 +0100

On Fri, 2008-08-15 at 01:50 +0100, Julian Foad wrote:
> When "svn merge" pops up my 3-way merge tool (kdiff3) and I resolve the
> conflicts and save, it then reports 'U' as the notification for the file
> that I've just helped it to merge. Isn't it supposed to report 'G' like
> it does when it merges a file with no help from me?

Huh... Scratch that. I'll get back with a proper report when I figure
out exactly what I'm seeing.

- Julian

To unsubscribe, e-mail: dev-unsubscribe_at_subversion.tigris.org
For additional commands, e-mail: dev-help_at_subversion.tigris.org
Received on 2008-08-15 03:20:42 CEST

This is an archived mail posted to the Subversion Dev mailing list.

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.