Mergiraf: A syntax-aware merge driver for Git (delpeuch.eu)
A central feature of Git is the ability to merge the contents of diverging revisions.
Git, Version Control, Software, Merge Tools
7 points by todsacerdoti 12 days ago | 1 comments