difftool.sourcetree.cmd=‘C:/Program Files (x86)/Beyond Compare 4/BComp.exe’ “
L
O
C
A
L
"
"
LOCAL" "
LOCAL""REMOTE” mergetool.sourcetree.cmd=‘C:/Program Files (x86)/Beyond Compare 4/BComp.exe’ “
L
O
C
A
L
"
"
LOCAL" "
LOCAL""REMOTE” “
B
A
S
E
"
−
o
"
BASE" -o "
BASE"−o"MERGED” 比较工具和合并工具配为sourcetree,sourcetree又用Beyond Compare进行比较合并进行工作;