SourceGear DiffMerge git Client 설정

SourceTree

Diff Arguments: \"$LOCAL\" \"$REMOTE\"

Merge Arguments: -merge -result=\"$MERGED\" \"$LOCAL\" \"$BASE\" \"$REMOTE\"

 

Fork

> Merge Tool

Merger Path: C:\Program Files\SourceGear\Common\DiffMerge\sgdm.exe

Arguments: -merge -result=$MERGED $LOCAL $BASE $REMOTE

 

> External Diff Tool

Diff Tool Path: C:\Program Files\SourceGear\Common\DiffMerge\sgdm.exe

Arguments: $LOCAL $REMOTE