Conflict identification in TortoiseMerge

I use TortoiseMerge as external merge tool for Accurev. When I try to merge
following files, the line containing "test1" is detected as being changed
equally in both directions. However, the line containing "test2" is not detected
as being equal. Is this a bug or is this intentional?

base.txt:
base
test

theirs.txt:
base
test1
test
test2
theirs

mine.txt:
base
test1
test
test2
mine

-----8<------

While using the standalone TortoiseMerge package (1.6.0), TortoiseMerge.exe
gives an error "System cannot find the specified file" on save if the merged
file is not present. However, merged file gets saved successfully.

Regards,
Suraj

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

To unsubscribe from this discussion, e-mail: [dev-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2009-05-13 07:01:19 CEST