From 2e5763d635cc9c77947acd613f5d2246bd88f4db Mon Sep 17 00:00:00 2001
From: Scott Worley <scottworley@scottworley.com>
Date: Tue, 16 Feb 2021 11:29:44 -0800
Subject: [PATCH 1/1] polite-merge: 2.1 -> 2.3, required for git 2.28 -> 2.29

---
 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 94dbc4b..87abfd7 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.1";
+        version = "2.3";
         src = fetchgit {
           url = "https://scottworley.com/polite-merge.git";
           rev = version;
-          sha256 = "0dqx8r1ldiynnwrqrr4zhjdlh69xl9dblkrn03g6ym8chnbsxwak";
+          sha256 = "0777h8pyvpml91w7lkj41shb16vpk2sbazlng44488zk3i8alq18";
         };
         postUnpack = "patchShebangs .";
         checkInputs = [ git ];
-- 
2.44.1