github - Git mergetool will not launch, but difftool will -
i have conflicts after merge. resolve conflicts, trying use meld. don't have trouble viewing differences using difftool. however, when use mergetool, meld not open.
git bash after using mergetool command:
my gitconfig file is:
[merge] tool = meld [mergetool "meld"] cmd = \"c:\\program files (x86)\\meld\\meld.exe\" "$local" "$base" "$remote" "--output=$merged" path = c:/program files (x86)/meld/meld.exe trustexitcode = false keepbackup = false [diff] tool = meld [difftool "meld"] cmd = \"c:\\program files (x86)\\meld\\meld.exe\" "$local" "$remote" path = c:/program files (x86)/meld/meld.exe [mergetool] keepbackup = false
Comments
Post a Comment