(no subject)

TortoiseSVN 1.5.9.15518 32-bit

Conflict handling missing in the "Check for modifications" windows.

I lost almost an hour on this :-(

The context menu item "Compare with base" brings up TortoiseMerge,
but the "Mark as resolved" button is disabled.

I have to gou to explorer, browse down to the file in question,
right click it, select "Edit conflicts", which brings up the same window
as before, but now the "Mark as resolved" button is enabled.
From here on ti works nicely...

Regards,
David

---------------------------------------------------------------------
http://www.nosoftwarepatents.com Innovation, not litigation !

---
David Balažic                 mailto:david.balazic_at_hermes-softlab.com
HERMES Softlab                http://www.hermes-softlab.com
Zagrebska cesta 104           Phone: +386 2 450 8937 
SI-2000 Maribor
Slovenija
---------------------------------------------------------------------
"Be excellent to each other." -
Bill S. Preston, Esq. & "Ted" Theodore Logan
---------------------------------------------------------------------
------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMessageId=1277096
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].