TortoiseMerge: Merge result not good enough
From: ch3cooli <ch3cooli_at_yahoo.com.hk>
Date: Mon, 9 Dec 2013 06:46:04 -0800 (PST)
Date: Mon, 9 Dec 2013 06:46:04 -0800 (PST)
TortoiseMerge: Merge result not good enough
TortoiseMerge.exe
/base:"D:\shoppinglist\shoppinglist.txt.BASE.txt"
/theirs:"D:\shoppinglist\shoppinglist.txt.REMOTE.txt"
/mine:"D:\shoppinglist\shoppinglist.txt.LOCAL.txt"
/merged:"D:\shoppinglist\shoppinglist.txt"
/basename:"BASE"
/theirsname:"REMOTE"
/minename:"LOCAL"
/mergedname:"shoppinglist.txt"
Any room for improvement? (See merge_p4merge.png as reference)
------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=757&dsMessageId=3070007
To unsubscribe from this discussion, e-mail: [dev-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2013-12-09 17:12:56 CET
