# emacs-mergetool

**Repository Path**: mirrors_codejamninja/emacs-mergetool

## Basic Information

- **Project Name**: emacs-mergetool
- **Description**: use emacs as git mergetool
- **Primary Language**: Unknown
- **License**: MIT
- **Default Branch**: main
- **Homepage**: None
- **GVP Project**: No

## Statistics

- **Stars**: 0
- **Forks**: 0
- **Created**: 2020-08-08
- **Last Updated**: 2026-03-21

## Categories & Tags

**Categories**: Uncategorized

**Tags**: None

## 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)