Hi,
upon editing a text conflict, my 3rd-party editor is invoked (SourceGear
DiffMerge).
It seems that the displayed titles are somehow wrong:
i.e.:
left: Remote file
center: Working Copy
right: Working Copy
Note that in TSVN 1.9 it used to be:
left: Working Copy
center: Working Base
right: Remote file
From the file content in TSVN 1.10 it still seems to be that way (i.e.
only the titles seem to be off).
The Merge Tool setting in the TSVN config dialog is set to:
[...]DiffMerge\sgdm.exe -nosplash -m -r=%merged -t1=%yname -t2=%bname
-t3=%tname -c=%mname %mine %base %theirs
This was left unchanged from TSVN 1.9. t1 is the left title, t2 the
center one, t3 the right one.
Based on the current TSVN still suggests that %tname is the title for
the file in the repository --- hence I'd assume that this should still
resolve to "adjacentroomscanner.h: Remote file". Or am I missing something?
--
Regards,
Stefan Hett, Developer/Administrator
--
You received this message because you are subscribed to the Google Groups
"TortoiseSVN" group.
To unsubscribe from this group and stop receiving emails from it, send an email
to [email protected].
To view this discussion on the web visit
https://groups.google.com/d/msgid/tortoisesvn/eeb90776-80a5-87a6-d5b7-ff6dbf9e195c%40egosoft.com.
For more options, visit https://groups.google.com/d/optout.
