4 ms·You can build a mergetool (https://git-scm.com/docs/git-mergetool https://git-scm.com/docs/git-mergetool)by procaryote 8mo agoYou can build a mergetool (https://git-scm.com/docs/git-mergetool https://git-scm.com/docs/git-mergetool)