Thomas Dy 84d9e56bc2 git: use diff3 conflictstyle %!s(int64=3) %!d(string=hai) anos
..
config 84d9e56bc2 git: use diff3 conflictstyle %!s(int64=3) %!d(string=hai) anos
ignore 9d240fa613 git: remove tags from ignore %!s(int64=3) %!d(string=hai) anos