Windows Git通过DiffMerge配置difftool和mergetool不工作

Windows Git通过DiffMerge配置difftool和mergetool不工作,windows,git,diffmerge,Windows,Git,Diffmerge,我正在尝试为git配置DiffMerge以用于difftool和mergetool。我使用了以下命令:- 命令提示符窗口中的以下命令将更新.gitconfig以配置GIT use DiffMerge: C:\> git config --global diff.tool diffmerge C:\> git config --global difftool.diffmerge.cmd "C:/Program\ Files/SourceGear/Common/DiffMe

我正在尝试为git配置DiffMerge以用于difftool和mergetool。我使用了以下命令:-

命令提示符窗口中的以下命令将更新.gitconfig以配置GIT use DiffMerge:

  C:\> git config --global diff.tool diffmerge

 C:\> git config --global difftool.diffmerge.cmd

  "C:/Program\ Files/SourceGear/Common/DiffMerge/sgdm.exe \"$LOCAL\" 
  \"$REMOTE\""`
如果我检查.gitconfig的内容,它有以下内容:-

   ` [diff]
        tool = diffmerge
    [mergetool "diffmerge"]
        cmd = C:/Program\\ Files/SourceGear/Common/DiffMerge/sgdm.exe -merge -result=\"\" \"\" \"\" \"\"
        trustExitCode = true
    [merge]
        tool = diffmerge
    [difftool "diffmerge"]
        cmd = C:/Program\\ Files/SourceGear/Common/DiffMerge/sgdm.exe \"\" \"\"
    [core]
        autocrlf = true
        excludesfile = C:\\Users\\dev\\Documents\\gitignore_global.txt
    [user]
        name = DESKTOP - VAFJEG6\\dev
          email = madsum.isalm2@gmail.com `
如果我尝试$git config--global--list:-

如果我尝试git$git difftool,它会显示以下对话框:-


怎么了?如何正确配置它

必须由shell解释
$LOCAL
/
$REMOTE
(如果从
git bash
而不是CMD会话键入)并替换为

直接编辑全局配置(
git config--global--Edit
),并添加缺少的元素以获得:

 [difftool "DiffMerge"]
     cmd = 'C:/Program Files/SourceGear/Common/DiffMerge/sgdm.exe' "$LOCAL" "$REMOTE"
 [merge]
     tool = DiffMerge
 [mergetool "DiffMerge"]
     cmd = 'C:/Program Files/SourceGear/Common/DiffMerge/sgdm.exe' -merge -result="$PWD/$MERGED" "$PWD/$LOCAL" "$PWD/$BASE" "$PWD/$REMOTE"
     trustExitCode = true
 [difftool "DiffMerge"]
     cmd = 'C:/Program Files/SourceGear/Common/DiffMerge/sgdm.exe' "$LOCAL" "$REMOTE"
 [merge]
     tool = DiffMerge
 [mergetool "DiffMerge"]
     cmd = 'C:/Program Files/SourceGear/Common/DiffMerge/sgdm.exe' -merge -result="$PWD/$MERGED" "$PWD/$LOCAL" "$PWD/$BASE" "$PWD/$REMOTE"
     trustExitCode = true