simnalamburt / .dotfiles

:memo: My UNIX-like system configuration files

Geek Repo:Geek Repo

Github PK Tool:Github PK Tool

<wook> git config --global merge.conflictstyle diff3

simnalamburt opened this issue · comments

[...]