From aec35dfa58192146a9048a559bb9b160d3ad4a36 Mon Sep 17 00:00:00 2001
From: John Wiegley <johnw@newartisans.com>
Date: Wed, 8 Apr 2015 14:03:14 -0500
Subject: [PATCH] Revert "git-imerge: new package"

This reverts commit 309d0f0c8b6664241d3bf5692f4463333f2c85e6.
---
 .../git-and-tools/default.nix                 |  2 --
 .../git-and-tools/git-imerge/default.nix      | 26 -------------------
 2 files changed, 28 deletions(-)
 delete mode 100644 pkgs/applications/version-management/git-and-tools/git-imerge/default.nix

diff --git a/pkgs/applications/version-management/git-and-tools/default.nix b/pkgs/applications/version-management/git-and-tools/default.nix
index f492ae61d0c..b206fc671b5 100644
--- a/pkgs/applications/version-management/git-and-tools/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/default.nix
@@ -102,6 +102,4 @@ rec {
   git-extras = callPackage ./git-extras { };
 
   git-cola = callPackage ./git-cola { };
-
-  git-imerge = callPackage ./git-imerge { };
 }
diff --git a/pkgs/applications/version-management/git-and-tools/git-imerge/default.nix b/pkgs/applications/version-management/git-and-tools/git-imerge/default.nix
deleted file mode 100644
index de304180685..00000000000
--- a/pkgs/applications/version-management/git-and-tools/git-imerge/default.nix
+++ /dev/null
@@ -1,26 +0,0 @@
-{ stdenv, fetchFromGitHub }:
-
-stdenv.mkDerivation rec {
-  name = "git-imerge-${version}";
-  version = "0.7.0";
-
-  src = fetchFromGitHub {
-    repo = "git-imerge";
-    owner = "mhagger";
-    rev = version;
-    sha256 = "09czjxgjbby54jx1v5m825k87v8g9g374hwv0r6ss48kv1ipvakq";
-  };
-
-  installPhase = ''
-    mkdir -p $out/bin
-    make install PREFIX=$out
-  '';
-
-  meta = with stdenv.lib; {
-    homepage = https://github.com/mhagger/git-imerge;
-    description = "Perform a merge between two branches incrementally";
-    license = licenses.gpl2;
-    platforms = platforms.all;
-    maintainers = [ maintainers.spwhitt ];
-  };
-}