clayrisser / emacs-mergetool

use emacs as git mergetool

emacs-mergetool

use emacs as git mergetool

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

Features

• loads emacs as git mergetool
• compatible with spacemacs

Installation

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

Dependencies

• GNU Make
• Emacs
• Git

Usage

git mergetool

Support

Submit an issue

Screenshots

Contribute a screenshot

Contributing

Review the guidelines for contributing

License

MIT License

Jam Risser © 2019

Changelog

Review the changelog

Credits

• Jam Risser - Author

Support on Liberapay

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

Add some fuel if you'd like to keep me going!