9 pname = "emacs-conflict";
10 version = "0-unstable-2022-11-21";
12 src = fetchFromGitHub {
14 repo = "emacs-conflict";
15 rev = "9f236b93930f3ceb4cb0258cf935c99599191de3";
16 hash = "sha256-DIGvnotSQYIgHxGxtyCALHd8ZbrfkmdvjLXlkcqQ6v4=";
19 passthru.updateScript = unstableGitUpdater { hardcodeZeroVersion = true; };
22 homepage = "https://github.com/ibizaman/emacs-conflict";
23 description = "Resolve conflicts happening when using file synchronization tools";
24 license = lib.licenses.gpl3Plus;
25 maintainers = with lib.maintainers; [ ibizaman ];