{"id":15891990,"url":"https://github.com/clayrisser/emacs-mergetool","last_synced_at":"2026-04-15T09:31:26.829Z","repository":{"id":116526311,"uuid":"186871845","full_name":"clayrisser/emacs-mergetool","owner":"clayrisser","description":"use emacs as git mergetool","archived":false,"fork":false,"pushed_at":"2023-07-07T09:02:02.000Z","size":642,"stargazers_count":2,"open_issues_count":0,"forks_count":0,"subscribers_count":1,"default_branch":"main","last_synced_at":"2025-10-10T14:56:44.337Z","etag":null,"topics":["emacs","git","merge","mergetool"],"latest_commit_sha":null,"homepage":"https://codejam.ninja","language":"Shell","has_issues":true,"has_wiki":null,"has_pages":null,"mirror_url":null,"source_name":null,"license":"mit","status":null,"scm":"git","pull_requests_enabled":true,"icon_url":"https://github.com/clayrisser.png","metadata":{"files":{"readme":"README.md","changelog":"CHANGELOG.md","contributing":"CONTRIBUTING.md","funding":null,"license":"LICENSE","code_of_conduct":null,"threat_model":null,"audit":null,"citation":null,"codeowners":null,"security":null,"support":null,"governance":null,"roadmap":null,"authors":null,"dei":null,"publiccode":null,"codemeta":null}},"created_at":"2019-05-15T17:15:42.000Z","updated_at":"2024-04-19T08:32:50.000Z","dependencies_parsed_at":null,"dependency_job_id":"a721729b-edf6-4315-829a-53e62da66a09","html_url":"https://github.com/clayrisser/emacs-mergetool","commit_stats":null,"previous_names":[],"tags_count":0,"template":false,"template_full_name":null,"purl":"pkg:github/clayrisser/emacs-mergetool","repository_url":"https://repos.ecosyste.ms/api/v1/hosts/GitHub/repositories/clayrisser%2Femacs-mergetool","tags_url":"https://repos.ecosyste.ms/api/v1/hosts/GitHub/repositories/clayrisser%2Femacs-mergetool/tags","releases_url":"https://repos.ecosyste.ms/api/v1/hosts/GitHub/repositories/clayrisser%2Femacs-mergetool/releases","manifests_url":"https://repos.ecosyste.ms/api/v1/hosts/GitHub/repositories/clayrisser%2Femacs-mergetool/manifests","owner_url":"https://repos.ecosyste.ms/api/v1/hosts/GitHub/owners/clayrisser","download_url":"https://codeload.github.com/clayrisser/emacs-mergetool/tar.gz/refs/heads/main","sbom_url":"https://repos.ecosyste.ms/api/v1/hosts/GitHub/repositories/clayrisser%2Femacs-mergetool/sbom","scorecard":null,"host":{"name":"GitHub","url":"https://github.com","kind":"github","repositories_count":286080680,"owners_count":31834502,"icon_url":"https://github.com/github.png","version":null,"created_at":"2022-05-30T11:31:42.601Z","updated_at":"2026-04-15T07:17:56.427Z","status":"ssl_error","status_checked_at":"2026-04-15T07:17:30.007Z","response_time":63,"last_error":"SSL_read: unexpected eof while reading","robots_txt_status":"success","robots_txt_updated_at":"2025-07-24T06:49:26.215Z","robots_txt_url":"https://github.com/robots.txt","online":false,"can_crawl_api":true,"host_url":"https://repos.ecosyste.ms/api/v1/hosts/GitHub","repositories_url":"https://repos.ecosyste.ms/api/v1/hosts/GitHub/repositories","repository_names_url":"https://repos.ecosyste.ms/api/v1/hosts/GitHub/repository_names","owners_url":"https://repos.ecosyste.ms/api/v1/hosts/GitHub/owners"}},"keywords":["emacs","git","merge","mergetool"],"created_at":"2024-10-06T07:42:24.642Z","updated_at":"2026-04-15T09:31:26.782Z","avatar_url":"https://github.com/clayrisser.png","language":"Shell","funding_links":["https://liberapay.com/codejamninja/donate"],"categories":[],"sub_categories":[],"readme":"# emacs-mergetool\n\n[![GitHub stars](https://img.shields.io/github/stars/codejamninja/emacs-mergetool.svg?style=social\u0026label=Stars)](https://github.com/codejamninja/emacs-mergetool)\n\n\u003e use emacs as git mergetool\n\n![](assets/emacs-mergetool.png)\n\nPlease ★ this repo if you found it useful ★ ★ ★\n\n\n## Features\n\n* loads emacs as git mergetool\n* compatible with spacemacs\n\n\n## Installation\n\n```sh\ngit clone https://github.com/codejamninja/emacs-mergetool.git\ncd emacs-mergetool\nmake install\n```\n\n\n## Dependencies\n\n* [GNU Make](https://www.gnu.org/software/make)\n* [Emacs](https://www.gnu.org/software/emacs)\n* [Git](https://git-scm.com)\n\n\n## Usage\n\n```sh\ngit mergetool\n```\n\n\n## Support\n\nSubmit an [issue](https://github.com/codejamninja/emacs-mergetool/issues/new)\n\n\n## Screenshots\n\n[Contribute](https://github.com/codejamninja/emacs-mergetool/blob/master/CONTRIBUTING.md) a screenshot\n\n\n## Contributing\n\nReview the [guidelines for contributing](https://github.com/codejamninja/emacs-mergetool/blob/master/CONTRIBUTING.md)\n\n\n## License\n\n[MIT License](https://github.com/codejamninja/emacs-mergetool/blob/master/LICENSE)\n\n[Jam Risser](https://codejam.ninja) © 2019\n\n\n## Changelog\n\nReview the [changelog](https://github.com/codejamninja/emacs-mergetool/blob/master/CHANGELOG.md)\n\n\n## Credits\n\n* [Jam Risser](https://codejam.ninja) - Author\n\n\n## Support on Liberapay\n\nA ridiculous amount of coffee ☕ ☕ ☕ was consumed in the process of building this project.\n\n[Add some fuel](https://liberapay.com/codejamninja/donate) if you'd like to keep me going!\n\n[![Liberapay receiving](https://img.shields.io/liberapay/receives/codejamninja.svg?style=flat-square)](https://liberapay.com/codejamninja/donate)\n[![Liberapay patrons](https://img.shields.io/liberapay/patrons/codejamninja.svg?style=flat-square)](https://liberapay.com/codejamninja/donate)\n","project_url":"https://awesome.ecosyste.ms/api/v1/projects/github.com%2Fclayrisser%2Femacs-mergetool","html_url":"https://awesome.ecosyste.ms/projects/github.com%2Fclayrisser%2Femacs-mergetool","lists_url":"https://awesome.ecosyste.ms/api/v1/projects/github.com%2Fclayrisser%2Femacs-mergetool/lists"}