Thomas Dy 349a0d6b31 nixpkgs/elvish: initial commit %!s(int64=2) %!d(string=hai) anos
..
git 84d9e56bc2 git: use diff3 conflictstyle %!s(int64=3) %!d(string=hai) anos
nixpkgs 349a0d6b31 nixpkgs/elvish: initial commit %!s(int64=2) %!d(string=hai) anos