News for hackers. Stuff that matters.

A comment on Graphics for JVM. Parent comment

Re:Graphics for JVM by chrisseaton on Tuesday November 17, 2020 @08:42AM (#25123599)
> I have it configured as my git mergetool

How are you doing this? I haven't seen any merge tool, let alone a standalone one, in the JetBrains toolbox. What am I missing?

[ Parent | on HN ]
Re:Graphics for JVM by cataphract on Tuesday November 17, 2020 @09:46AM (#25124260)
You invoke it with "idea.sh merge <left> <right> <base> <out>". TBH, I don't think it's anything special; I've been using p4merge for years.
[ Parent | on HN ]
Re:Graphics for JVM by anentropic on Tuesday November 17, 2020 @10:11AM (#25124587)
By the steps here https://stackoverflow.com/a/47712453/202168
[ Parent | on HN ]