Even without plugin in a three-ways tool, Git's conflict can provide more information. [merge] # display 3 parts for each conflict, # inclu

Even without plugin in a three-ways tool, Git's conflict can provide more information. [merge] # display 3 parts for each conflict, # including the common ancestor conflictstyle = diff3 There's also the option to use a semantic merge tool. AFAIK, there are only paying tools for this, and only a few languages are supported.