git-mergetool

Run merge conflict resolution tools to resolve merge conflicts

copy
2
0
git mergetool -t opendiffuse opendiff to merge

6 years, 3 months ago john2 0 | details |

copy
1
0
git mergetool -t diffmergeUse diffmerge to merge

6 years, 3 months ago john2 0 | details |