Ecosyste.ms: Awesome

An open API service indexing awesome lists of open source software.

Awesome Lists | Featured Topics | Projects

https://github.com/magit/magit-imerge

Magit extension for git-imerge
https://github.com/magit/magit-imerge

emacs magit merge-conflicts

Last synced: about 1 month ago
JSON representation

Magit extension for git-imerge

Awesome Lists containing this project

README

        

[![License GPL 3][badge-license]](http://www.gnu.org/licenses/gpl-3.0.txt)
[![MELPA](https://melpa.org/packages/magit-imerge-badge.svg)](https://melpa.org/#/magit-imerge)

Magit-imerge is a Magit interface to git-imerge, a Git extension for
performing incremental merges. See git-imerge's [homepage] for more
information about git-imerge. The [commentary] in magit-imerge.el
provides an overview of Magit-imerge commands.

[badge-license]: https://img.shields.io/badge/license-GPL_3-green.svg
[homepage]: https://github.com/mhagger/git-imerge
[commentary]: https://github.com/magit/magit-imerge/blob/master/magit-imerge.el#L24