search

simnalamburt / .dotfiles

:memo: My UNIX-like system configuration files
Other
116 stars 13 forks source link

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

Closed simnalamburt closed 8 years ago

wookayin commented 8 years ago

[...]

simnalamburt commented 8 years ago

default