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

[TSVN] 'Edit Conflicts' choking

From: Alexander Garden <tsvn_at_garden.poboxed.net>
Date: 2005-03-22 12:39:05 CET

Boot problems behind me (bad p/s, I think), I have gotten a chance to
explore this software. I'm impressed. It looks truly slick.

I do, however, have a problem. When I select 'Edit Conflicts' on a file
with conflicts, TortoiseMerge gives me the following error:
The File
C:\Documents and Settings\Garden\Desktop\OtherCheckout
\createstuff.sql.r9 is not a valid text file!

The file is there and it is text and it does look correct. I downloaded
the nightly build but the problem persists. Didn't find anything in the
FAQ. Hints?

Alexander

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: dev-help@tortoisesvn.tigris.org
Received on Tue Mar 22 12:41:01 2005

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

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