Built-in Git Diff/Merge Tool?

I do Git from command-line and nothing's gonna change that.  I know Webstorm has a bunch of UI ways of performing Git commands but I prefer command-line.  With that, is there a built-in merge tool in webstorm so that if I do a merge from command-line that it would throw up the Webstorm merge tool if that even exists as my Git merge/diff tool?  I gotta assume Webstorm must have a merge tool built-in and if it's anything as good as the diff tool for local history I'd love to take advantage of diffing for merges too with the same tool but from the command-line.

4 comments
Comment actions Permalink

that's if you want to manually specify stuff to merge or diff.  I want it tied to git diff so that when git finds a merge conflict it fires up the Webstorm Merge UI automatically instead of others out there such as kdiff3, etc..

0
Comment actions Permalink

Hmm... would you like to know how to set up webstorm to work as a merge tool for git? please see https://coderwall.com/p/gc_hqw/use-intellij-or-webstorm-as-your-git-diff-tool-even-on-windows,
for example - does it work for you?

0
Comment actions Permalink

yes I found something similar that worked for me last night


https://gist.github.com/jvandyke/4355099

thanks!

0

Please sign in to leave a comment.