RE: Re: TortoiseMerge missing conflicts -- version information + files

> > Question/Issue 2: Why does Tortoise show conflicts in lines 256 - 301?? Those lines aren't different. The only difference is in line 255!?
> It is three-way merge I guess you changed that block (256-301) in both
> file even with most lines same.

Yeah, but generally: Why does Tortoise report conflicts when the result in both changes is the same?

> > Can anybody tell what's going wrong here? If it is helpful, I can also provide the files where tortoise stores the revisions.
> It it always good idea to send minimal test files. You can learn

Ok, I've attached the concerned files.

> Also reporting version is helpful.

Here's the version information:

TortoiseSVN 1.6.16, Build 21511 - 64 Bit , 2011/06/01 19:00:35
Subversion 1.6.17,
apr 1.3.12
apr-utils 1.3.12
neon 0.29.6
OpenSSL 1.0.0d 8 Feb 2011
zlib 1.2.5

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

To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].