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

Re: Problems during merge

From: Christoph Bartoschek <bartoschek_at_or.uni-bonn.de>
Date: Thu, 11 Feb 2010 15:14:19 +0100

Am Donnerstag, 11. Februar 2010 schrieb Neels J Hofmeyr:
> Hi Christoph,
> it would be nice if you could provide a way to reproduce this issue. I am
> aware that this can be some work, and we would highly appreciate it. :)


here is the script. When it comes to choosing the merge operation I choose
(p). The file dir_b/file has the wrong conflict markers.


Received on 2010-02-11 15:15:46 CET

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

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