<wook> git config --global merge.conflictstyle diff3
simnalamburt opened this issue · comments
Hyeon Kim (김지현) commented
Jongwook Choi commented
[...]
Hyeon Kim (김지현) commented
:memo: My UNIX-like system configuration files
simnalamburt opened this issue · comments
[...]