Is there an easy way to compare conflicting files


I currently use omnifocus for my journal and not keeping but occasionally I get a conflict between the two versions.

I was wondering if there was a tool that could compare the differences between the two conflicting files so I could merge the changes I wanted?

Thank you