git-mergetool

Run merge conflict resolution tools to resolve merge conflicts

Use diffmerge to merge
copy
1
0
git mergetool -t diffmergeUse diffmerge to merge

7 years, 3 months ago john2 0 | details |