git-mergetool

Run merge conflict resolution tools to resolve merge conflicts

use opendiff to merge
copy
2
0
git mergetool -t opendiffuse opendiff to merge

7 years, 7 months ago john2 0 | details |