https://github.com/clayrisser/emacs-mergetool

use emacs as git mergetool
https://github.com/clayrisser/emacs-mergetool

emacs git merge mergetool

Last synced: 2 months ago
JSON representation

use emacs as git mergetool

• Host: GitHub
• URL: https://github.com/clayrisser/emacs-mergetool
• Owner: clayrisser
• License: mit
• Created: 2019-05-15T17:15:42.000Z (about 7 years ago)
• Default Branch: main
• Last Pushed: 2023-07-07T09:02:02.000Z (almost 3 years ago)
• Last Synced: 2025-10-10T14:56:44.337Z (9 months ago)
• Topics: emacs, git, merge, mergetool
• Language: Shell
• Homepage: https://codejam.ninja
• Size: 627 KB
• Stars: 2
• Watchers: 1
• Forks: 0
• Open Issues: 0
• Metadata Files:
  • Readme: README.md
  • Changelog: CHANGELOG.md
  • Contributing: CONTRIBUTING.md
  • License: LICENSE

Awesome Lists containing this project

README

          
# emacs-mergetool

[![GitHub stars](https://img.shields.io/github/stars/codejamninja/emacs-mergetool.svg?style=social&label=Stars)](https://github.com/codejamninja/emacs-mergetool)

> use emacs as git mergetool

![](assets/emacs-mergetool.png)

Please ★ this repo if you found it useful ★ ★ ★

## Features

* loads emacs as git mergetool

* compatible with spacemacs

## Installation

```sh

git clone https://github.com/codejamninja/emacs-mergetool.git

cd emacs-mergetool

make install

```

## Dependencies

* [GNU Make](https://www.gnu.org/software/make)

* [Emacs](https://www.gnu.org/software/emacs)

* [Git](https://git-scm.com)

## Usage

```sh

git mergetool

```

## Support

Submit an [issue](https://github.com/codejamninja/emacs-mergetool/issues/new)

## Screenshots

[Contribute](https://github.com/codejamninja/emacs-mergetool/blob/master/CONTRIBUTING.md) a screenshot

## Contributing

Review the [guidelines for contributing](https://github.com/codejamninja/emacs-mergetool/blob/master/CONTRIBUTING.md)

## License

[MIT License](https://github.com/codejamninja/emacs-mergetool/blob/master/LICENSE)

[Jam Risser](https://codejam.ninja) © 2019

## Changelog

Review the [changelog](https://github.com/codejamninja/emacs-mergetool/blob/master/CHANGELOG.md)

## Credits

* [Jam Risser](https://codejam.ninja) - Author

## Support on Liberapay

A ridiculous amount of coffee ☕ ☕ ☕ was consumed in the process of building this project.

[Add some fuel](https://liberapay.com/codejamninja/donate) if you'd like to keep me going!

[![Liberapay receiving](https://img.shields.io/liberapay/receives/codejamninja.svg?style=flat-square)](https://liberapay.com/codejamninja/donate)

[![Liberapay patrons](https://img.shields.io/liberapay/patrons/codejamninja.svg?style=flat-square)](https://liberapay.com/codejamninja/donate)