This is an automated email from the git hooks/post-receive script.
guix_mirror_bot pushed a commit to branch master
in repository guix.
The following commit(s) were added to refs/heads/master by this push:
new 5d4c6b3e26 gnu: Add emacs-conflict-buttons.
5d4c6b3e26 is described below
commit 5d4c6b3e26373e03b35c03e37abd051ee899cc21
Author: moksh <[email protected]>
AuthorDate: Tue Feb 24 23:05:41 2026 +0530
gnu: Add emacs-conflict-buttons.
* gnu/packages/emacs-xyz.scm (emacs-conflict-buttons): New variable.
Merges guix/guix!6678
Change-Id: I11ea3df5c43ba7dec5990f5e2b1c43fccc3829a0
Signed-off-by: Cayetano Santos <[email protected]>
---
gnu/packages/emacs-xyz.scm | 29 ++++++++++++++++++++++++++++-
1 file changed, 28 insertions(+), 1 deletion(-)
diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm
index 6da3c713cf..5f9a511df6 100644
--- a/gnu/packages/emacs-xyz.scm
+++ b/gnu/packages/emacs-xyz.scm
@@ -162,7 +162,7 @@
;;; Copyright © 2025 Jake Forster <[email protected]>
;;; Copyright @ 2025 Andrew Wong <[email protected]>
;;; Copyright @ 2025 Nik Gaffney <[email protected]>
-;;; Copyright © 2025 Untrusem <[email protected]>
+;;; Copyright © 2025, 2026 Untrusem <[email protected]>
;;; Copyright © 2025 case_lambda <[email protected]>
;;; Copyright © 2026 Kenny Ballou <[email protected]>
;;;
@@ -2776,6 +2776,33 @@ versions of a topic branch.")
diffs.")
(license license:expat))))
+(define-public emacs-conflict-buttons
+ ;; No releases
+ (let ((commit "22af851d6a0cdd226ef7ba0db54fa096c8ddf235")
+ (revision "0"))
+ (package
+ (name "emacs-conflict-buttons")
+ (version (git-version "0.1.0" revision commit))
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://git.andros.dev/andros/conflict-buttons.el/";)
+ (commit commit)))
+ (sha256
+ (base32 "04lhpl1fb6ncg2li07szk4yw7ix9xp657q5f72gcm1yxa1fynvnx"))))
+ (build-system emacs-build-system)
+ (arguments
+ (list
+ #:tests? #f)) ;; no tests
+ (home-page "https://git.andros.dev/andros/conflict-buttons.el/";)
+ (synopsis "Clickable inline buttons for merge conflict resolution in
Emacs")
+ (description
+ "This package displays clickable buttons directly above conflict markers
+while editing files with git merge conflicts, allowing you to resolve conflicts
+with a single click instead of remembering keyboard shortcuts.")
+ (license license:gpl3+))))
+
(define-public emacs-malyon
(package
(name "emacs-malyon")
