From: Scott Worley <scottworley@scottworley.com>
Date: Tue, 16 Feb 2021 19:29:44 +0000 (-0800)
Subject: polite-merge: 2.1 -> 2.3, required for git 2.28 -> 2.29
X-Git-Url: http://git.scottworley.com/auto-upgrade-with-pinch/commitdiff_plain/2e5763d635cc9c77947acd613f5d2246bd88f4db?ds=inline;hp=edaaa0c0ab2761711c3b9217a2c7396a56d6a54e

polite-merge: 2.1 -> 2.3, required for git 2.28 -> 2.29
---

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 ];