Qt Creator 3.0.1 and GIT mergetool
Every time I launch it, I get "process terminated with exit code 1". I was assuming that the mergetool used the diff tool.....is this not the case? Does it uses an external mergetool.....if so, how do you configure it to use it? Also, if this is the case, what is the preferred mergetool for use with Creator in windows?
I found that the merge tool in Creator relies on the merge tool in GIT. GIT relies on 3rd party applications for their merge tool. The following are valid merge tools for GIT: emerge, gvimdiff, kdiff3, meld, vimdiff, and tortoisemerge.
Here is a short tutorial for setting up the merge tool in GIT.