配置操作路径Tools -> Options -> External Diff/Merge 都选自定义
diff配置
Diff Command: xxxpath\studio64.exe
Arguments: diff $LOCAL $PWD/$REMOTE
merge配置
Merge Command: xxxpath\studio64.exe
Arguments: merge $LOCAL $PWD/$REMOTE $PWD/$BASE $MERGED
生命不息,学习不止!
配置操作路径Tools -> Options -> External Diff/Merge 都选自定义
Diff Command: xxxpath\studio64.exe
Arguments: diff $LOCAL $PWD/$REMOTE
Merge Command: xxxpath\studio64.exe
Arguments: merge $LOCAL $PWD/$REMOTE $PWD/$BASE $MERGED