I've set up `git mergetool` to open intellij - and when it does, the friggin arrows as what to accep...

# intellij

[ursus]

I've set up git mergetool to open intellij - and when it does, the friggin arrows as what to accept as missing

is this a bug or am I stupid?

latest intellij/androistudio/pycharm as well

[CLOVIS]

Maybe it's confused that it's a merge (where you can change stuff) as opposed to a diff (where you can't)?

[CLOVIS]

how did you set it up?

[CLOVIS]

Looks like it may be a regression, I see the arrows in 2024.2 but not in 2024.3.1.1

I created an issue, please vote for it: https://youtrack.jetbrains.com/issue/IDEA-365211/Edition-arrows-in-diff-are-gone-when-ran-in-standalone-mode

[ursus]

dammit, thank you anyways

as a workaround if I open the folder the files are in intellij as a sort of project, then i can use the built-in merging ui and there it works

isnt it maybe related to the fact its out of project files? some read only protection?