mmanela / diffplex

DiffPlex is Netstandard 1.0+ C# library to generate textual diffs.
Apache License 2.0
990 stars 183 forks source link

3 way diff? #88

Open codec-abc opened 2 years ago

codec-abc commented 2 years ago

Hi,

Diff newbie here. Assuming I want to build a 3 way-merge tool (1 common ancestor and 2 versions) can this be used to build such a thing? In that case , how one should do it. Maybe diffing both file against the common ancestor and comparing sequence but then conflict don't seem to detect at first glance. If you have any advice about this please feel free to give them 😄