git mergetool reports “No files need merging”

May 8, 2023 by Tarik

This fixed it for me:
git mergetool .

I found this fix here

Hata!: SQLSTATE[HY000] [1045] Access denied for user 'divattrend_liink'@'localhost' (using password: YES)