@b0rk For some reason, I don't trust GUI tools to manipulate the git repository (probably because some GUI tool I've once tried to use made a mess of the repository state, turning a merge into a non-merge with the contents which should have been in the merge). So when editing files to resolve merge conflicts or when adding files and committing, I always use the trusty command line; which then defaults to the terminal text editor I have configured as default.