Conflict File reading support

[amansx]

Hi,
At present Diffmerge cannot read conflict files so even though this feature should be trivial as it already supports 3 way merge
so save this in a file and try to open it and it can't parse it, this feature is available on winmerge but winmerge doesnt work on mac so it'd be great if you folks can support this feature

the number of planets are
<<<<<<< HEAD
nine
=======
eight
>>>>>>> branch-a

[Beth]

I've tried this on a Windows machine and it works there. Trying a Mac next.


UPDATE: No problem in the Mac.

Which tool are you using for editing? Which file extension on the file?

Or did I completely misunderstand what you are saying? Can you clarify?

[amansx]

Hi,
Try to open just this file, diffmerge would ask you for a second file to compare it with, which is not the intended behavior. In other words this file contains all three files for merging, together in one file, aka the conflict file, like I said save this file and open it with winmerge to see the difference with diffmerge (I havn't tried diffmerge windows so can't confirm for windows). Thanks for the reply though

[Beth]

Try to open just this file, diffmerge would ask you for a second file to compare it with, which is not the intended behavior.

That is normal behavior for DiffMerge, because it reads what is in the file as straight text, instead of creating multiple files out of it. It needs to know what to diff against. I have put in a feature request.

V: G7548