> I have it configured as my git mergetool How are you doing this? I haven't see... | Hacker News

Hacker Newsnew | past | comments | ask | show | jobs | submit

		chrisseaton on Nov 17, 2020 \| parent \| context \| favorite \| on: Graphics for JVM > 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?

cataphract on Nov 17, 2020 | [–]

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.

anentropic on Nov 17, 2020 | [–]

By the steps here https://stackoverflow.com/a/47712453/202168

Guidelines | FAQ | Lists | API | Security | Legal | Apply to YC | Contact