From 88a5ed54d78333e5dd0c0ed806906522acefd89e Mon Sep 17 00:00:00 2001
From: Scott Worley <scottworley@scottworley.com>
Date: Wed, 10 Jun 2020 16:45:41 -0700
Subject: [PATCH 1/1] polite-merge: 2.0 -> 2.1

---
 overlays/polite-merge.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/overlays/polite-merge.nix b/overlays/polite-merge.nix
index b1cf565..94dbc4b 100644
--- a/overlays/polite-merge.nix
+++ b/overlays/polite-merge.nix
@@ -5,11 +5,11 @@ self: super: {
     self.callPackage ({ fetchgit, git, stdenv, }:
       stdenv.mkDerivation rec {
         pname = "polite-merge";
-        version = "2.0";
+        version = "2.1";
         src = fetchgit {
           url = "https://scottworley.com/polite-merge.git";
           rev = version;
-          sha256 = "0dds7pf60aqm7r4g13q1bhfbzmi478c2zy2ddj5zgq0rp2kwfaba";
+          sha256 = "0dqx8r1ldiynnwrqrr4zhjdlh69xl9dblkrn03g6ym8chnbsxwak";
         };
         postUnpack = "patchShebangs .";
         checkInputs = [ git ];
-- 
2.44.1