Best 2 Git Mergetools Open Source Projects

Git Resolve Conflict

:heavy_dollar_sign: :heavy_plus_sign: :heavy_minus_sign: :white_check_m...

AutoMergeTool

Half automatic merge toolchain for git