git - kdiff3 not available as c:/Program -

-

i need here )

i started use conemu powershell git , recommended install kdiff3 merge procedure

i install kdiff3-64bit-setup_0.9.98-2 version , make changes in ginconfig

[merge]     tool = kdiff3 [mergetool "kdiff3"]     path = "c:/program files/kdiff3/kdiff3.exe" [diff]     tool = kdiff3     guitool = kdiff3 [difftool "kdiff3"]     path = "c:/program files/kdiff3/kdiff3.exe"

but when try merge branches got error

the merge tool kdiff3 not available 'c:/program'

d:\vs_projects\tsagent [master +9 ~9 -6 !4 | +72 ~0 -0 !5 !]> git mergetool merging: tsagent.data/espioprovider.cs tsagent/models/offers/savestatuspostmodel.cs tsagent/tsagent.csproj tsagent/tsagent.csproj.user tsagent/web.config normal merge conflict 'tsagent.data/espioprovider.cs': {local}: modified file {remote}: modified file hit return start merge resolution tool (kdiff3): merge tool kdiff3 not available 'c:/program'

i tried reinstall kdiff install in different folder without space c:/kdiff/kdiff3.exe try use quotes in gitconfig (single ' or double ") use different slashes \ or / , still got same problem. can't find same problem in google ;( maybe u can me that....

best regards , thx!

have not tested, suggestions

try escape space in "program\ files"

path = "c:/program\ files/kdiff3/kdiff3.exe"

or can use short names, in cases be

path = "c:/progra~1/kdiff3/kdiff3.exe"

Comments

Post a Comment

Popular posts from this blog

node.js - Mongoose: Cast to ObjectId failed for value on newly created object after setting the value -

-
this question has answer here: what's mongoose error cast objectid failed value xxx @ path “_id”? 7 answers even though has been asked many times because entity has no valid objectid field. i came across situation objectid set value can casted objectid still error. the schema: var serviceschema = parammongoose.schema({ servicename:{ type: parammongoose.schema.types.objectid , ref: 'servicenames',required:true } }); pseudo code: servicefromdb=new service({servicename:'some name'}); servicefromdb.servicename='000000000000000000000001'; servicefromdb.save(function(paramerror,paramdata){ if(paramerror){ console.log('but but...',servicefromdb,paramerror) } }); the output of code is: but but... { servicename: 000000000000000000000001, _id: 55079a90286f49280364f78b } { [casterror: cast objectid faile...
Read more

gradle error "Cannot convert the provided notation to a File or URI" -

-
i have defined 2 system properties in gradle.properties: systemprop.builddir=build systemprop.cfgdir=build\\cfg and have following task defined in build.gradle: task clean(group:'clean',description:'clean project') << { ant.sequential { delete(dir: system.properties.builddir) mkdir(dir: system.properties.builddir) delete(dir: system.properties.cfgdir) mkdir(dir: system.properties.cfgdir) } } this generates following error: execution failed task ':clean'. > cannot convert provided notation file or uri: {dir=build}. following types/formats supported: - string or charsequence path, e.g 'src/main/java' or '/usr/include' - string or charsequence uri, e.g 'file:/usr/include' - file instance. - uri or url instance. but equivalent block of code not generate error , works expected: task clean(group:'clean',description:'clean project') << { ...
Read more

python - NameError: name 'subprocess' is not defined -

-
i'm trying make rng website: http://jamesdotcom.com/?p=417 . when run following code: captureimage = subprocess.popen( [ "fswebcam", "-r", "356x292", "-d", "/dev/video0", "static.jpg", "--skip", "10" ], stdout=devnull, stderr=devnull) captureimage.communicate() i following error message: nameerror: name 'subprocess' not defined what should do? thanks have imported first? import subprocess captureimage = subprocess.popen(["fswebcam", ...) subprocess included in python standard library since python 2.4. should not necessary install it.
Read more