gitconfig: set merge.conflictstyle to diff3
Xresources: set url launcher to dwb