I started to help you here)
I use ConEmu powershell with Git and as I set kdiff3 merge process was recommended I
I KDiff3-64bit-Setup_0.9.98-2 version to change the setting and ginconfig
< code> [merge] device = kdiff3 [mergetool "kdiff3"] path = "C: / program files / kDiff3 / kdiff3.exe" [diff] device = kdiff3 guitool = kdiff3 [difftool "kdiff3"] path = "C: / Program files / kDiff3 / kdiff3.exe "
but when So I tried to merge the branches I found the error
Merge Tool KdF 3 C is not available as / program '
d: \ VS_Projects \ TsAgent [Master + 9 ~ 9 -6! 4 | +72 ~ 0 -0! 5!] & Gt; Git mergetool merger: TsAgent.Data/EspioProvider.cs TsAgent / model / proposal / SaveStatusPostModel.cs TsAgent / TsAgent.csproj TsAgent / TsAgent.csproj.user TsAgent / Web.config common struggle 'TsAgent.Data/EspioProvider.cs' Merge: {Local}: Modified file {Remote}: Merge tool is not available as kdiff3 'C: / Program' to modify modified file Hit Return Merge Resolution Tool (kdiff3)
I tried to re-install it in separate folder without cd space like cdiff. /KDiff/kdiff3.exe Use quotation marks in Gitconfig to try different slash \ or / and still found the same problem I can not get (single or double) use
path =" C : / Program \ files / kdf3 / kdf 3.exe "
or you can use short names, in most cases
No comments:
Post a Comment