Thomas Dy f5be0cd060 nixpkgs/elvish: move local import later %!s(int64=2) %!d(string=hai) anos
..
git 84d9e56bc2 git: use diff3 conflictstyle %!s(int64=3) %!d(string=hai) anos
nixpkgs f5be0cd060 nixpkgs/elvish: move local import later %!s(int64=2) %!d(string=hai) anos