From 4e2190cd0f3251bf7d876d3d75bc873cd94a23be Mon Sep 17 00:00:00 2001
From: fuwa <echowss@gmail.com>
Date: Sat, 18 Aug 2018 14:24:53 +0000
Subject: [PATCH] add git-imerge

---
 script/nix/shell.nix | 1 +
 1 file changed, 1 insertion(+)

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
   )