From 09aad836d860d7edc1408fcb02a8375355164f3f Mon Sep 17 00:00:00 2001
From: ibizaman <ibizapeanut@gmail.com>
Date: Mon, 20 May 2024 20:50:12 -0700
Subject: [PATCH] emacsPackages.emacs-conflict: init at 0-unstable-2022-11-21

---
 .../emacs/elisp-packages/manual-packages.nix  |  2 ++
 .../emacs-conflict/default.nix                | 25 +++++++++++++++++++
 2 files changed, 27 insertions(+)
 create mode 100644 pkgs/applications/editors/emacs/elisp-packages/manual-packages/emacs-conflict/default.nix

diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages.nix
index 02cf40eb9639..371676c2d1e3 100644
--- a/pkgs/applications/editors/emacs/elisp-packages/manual-packages.nix
+++ b/pkgs/applications/editors/emacs/elisp-packages/manual-packages.nix
@@ -33,6 +33,8 @@ in
 
   elisp-ffi = callPackage ./manual-packages/elisp-ffi { };
 
+  emacs-conflict = callPackage ./manual-packages/emacs-conflict { };
+
   ess-R-object-popup = callPackage ./manual-packages/ess-R-object-popup { };
 
   evil-markdown = callPackage ./manual-packages/evil-markdown { };
diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/emacs-conflict/default.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/emacs-conflict/default.nix
new file mode 100644
index 000000000000..b32ee2f8a9f6
--- /dev/null
+++ b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/emacs-conflict/default.nix
@@ -0,0 +1,25 @@
+{ lib
+, fetchFromGitHub
+, trivialBuild
+, emacs
+}:
+
+trivialBuild {
+  pname = "emacs-conflict";
+  version = "0-unstable-2022-11-21";
+
+  src = fetchFromGitHub {
+    owner = "ibizaman";
+    repo = "emacs-conflict";
+    rev = "9f236b93930f3ceb4cb0258cf935c99599191de3";
+    sha256 = "sha256-DIGvnotSQYIgHxGxtyCALHd8ZbrfkmdvjLXlkcqQ6v4=";
+  };
+
+  meta = with lib; {
+    description = "Resolve conflicts happening when using file synchronization tools";
+    homepage = "https://github.com/ibizaman/emacs-conflict";
+    license = licenses.gpl3;
+    maintainers = with maintainers; [ ibizaman ];
+    inherit (emacs.meta) platforms;
+  };
+}