smartgitkaleidoscope
smartgit and ksdiff integration
I'd like using the Kaleidoscope/ksdiff as my conflict solver in smartgit. I've tried configuring by myself but I can't. So, what is the line instruction that I need to put at arguments input on edit conflict solver configuration?
Screenshot:
Solution
The required configuration to integrate Kaleidoscope/ksdiff with smartgit is that:
--merge --output ${mergedFile} --base ${baseFile} -- ${leftFile} --snapshot ${rightFile} --snapshot
just put it on arguments field and the magic will happen :)
- Math.Sin() gives incorrect value
- How to run my python script when the sunOS is start booting
- Express-session: not resetting cookie expiration on each request
- Getting a stack overflow exception when normalizing a vector
- Edit default summary function in R gives error for multiple variables
- What was a For loop? Why isn't it needed in R?
- How to use download button in shiny and save results in various formats (csv, texte, pdf, spss...)?
- Why are there two assignment operators, `<-` and `->` in R?
- lm()$assign: what is it?
- How to get the value of list(...) in R and S functions
- Design matrix for MLM from library(lme4) with fixed and random effects
- how to generate elements not included in my sample
- Create a matrix with gradually changing values without a for loop
- Emacs ESS and S-plus ( S+ ) 8.1 compatability
- How to lag date-index in a time-series in R?
- Nonlinear regression in R / S
- Calling R from S-Plus?