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

TMerge does not show all conflicts?

From: Sven Strickroth <tigris_at_cs-ware.de>
Date: Sat, 17 Nov 2012 10:33:45 -0800 (PST)

If I run TMerge with the following command no merge conflict is shown.

bin\TortoiseMerge.exe /base:"D:\tst\src\Changelog.txt.BASE.txt" /theirs:"D:\tst\src\Changelog.txt.REMOTE.txt" /mine:"D:\tst\src\Changelog.txt.LOCAL.txt" /merged:"D:\tst\src\Changelog.txt" /basename:"BASE" /theirsname:"REMOTE" /minename:"LOCAL" /mergedname:"Changelog.txt"

If I switch mine and theirs, the conflict is shown as expected.

Is this intended behavior?

------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMessageId=3029085

To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2012-11-17 19:33:50 CET

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