On git merge conflicts, ST fails to launch the external merge tool. Tried with FileMerge and Kaleidoscope and custom command. Neither works. The four files LOACL, BASE, REMOTE, BACKUP are created though.
External diff works fine.