[user] email = [email protected] name = ray0324 [gui] encoding = utf-8 [diff] tool = bc4 [difftool] prompt = false [difftool "bc4"] cmd = "\"D:/Program Files/BeyondCompare/bcomp.exe\" \"$LOCAL\" \"$REMOTE\"" [merge] tool = bc [mergetool] prompt = false keepBackup = false [mergetool "bc"] cmd = "\"D:/Program Files/BeyondCompare/bcomp.exe\" \"$LOCAL\" \"$REMOTE\" \"$BASE\" \"$MERGED\"" [user] email = [email protected] name = r