Thomas Dy 79f260be9c nixpkgs/neovim: add support for elvish %!s(int64=2) %!d(string=hai) anos
..
git 84d9e56bc2 git: use diff3 conflictstyle %!s(int64=3) %!d(string=hai) anos
nixpkgs 79f260be9c nixpkgs/neovim: add support for elvish %!s(int64=2) %!d(string=hai) anos