Git can call a whole bunch of merge visualization and conflict resolution tools....

		yencabulator on June 2, 2020 \| parent \| context \| favorite \| on: The Myers diff algorithm that is used in Git (2017... Git can call a whole bunch of merge visualization and conflict resolution tools. See `git mergetool --tool-help`.