3 way & semantic merge

https://www.plasticscm.com/documentation/advanced-version-control-guide#two-way-merge

https://users.semanticmerge.com/documentation/intro-guide/semanticmerge-intro-guide.shtml

https://www.plasticscm.com/book/#_3_way_merge