diff --git a/script/nix/shell.nix b/script/nix/shell.nix index ea68912..da75bba 100644 --- a/script/nix/shell.nix +++ b/script/nix/shell.nix @@ -69,6 +69,7 @@ with nixpkgs; vim exiftool + gitAndTools.git-imerge ] ++ android-studio-deps )