Re: svn commit: r1075802 - in /subversion/trunk/subversion: libsvn_client/merge.c libsvn_wc/merge.c tests/cmdline/merge_tests.py

From: Daniel Shahaf <d.s_at_daniel.shahaf.name>
Date: Fri, 4 Mar 2011 13:41:53 +0200

Philip Martin wrote on Fri, Mar 04, 2011 at 11:22:37 +0000:
> It's long standing behaviour that removing the left/right files is one
> way to resolve a conflict.

/me learnt something new
Received on 2011-03-04 12:42:44 CET

This message: [ Message body ]
Next message: John Beranek: "Re: Breakage on trunk?"
Previous message: Daniel Shahaf: "Re: Breakage on trunk?"
In reply to: Philip Martin: "Re: svn commit: r1075802 - in /subversion/trunk/subversion: libsvn_client/merge.c libsvn_wc/merge.c tests/cmdline/merge_tests.py"

Contemporary messages sorted: [ by date ] [ by thread ] [ by subject ] [ by author ] [ by messages with attachments ]