https://github.com/martinstarman/mersge

Simple 3-way merge editor for the terminal
https://github.com/martinstarman/mersge

conflict conflicts console git merge rust rust-lang terminal

Last synced: about 2 months ago
JSON representation

Simple 3-way merge editor for the terminal

• Host: GitHub
• URL: https://github.com/martinstarman/mersge
• Owner: martinstarman
• License: mit
• Created: 2022-08-09T12:25:34.000Z (almost 4 years ago)
• Default Branch: master
• Last Pushed: 2022-09-09T17:59:42.000Z (almost 4 years ago)
• Last Synced: 2025-10-29T04:09:33.218Z (8 months ago)
• Topics: conflict, conflicts, console, git, merge, rust, rust-lang, terminal
• Language: Rust
• Homepage:
• Size: 1.64 MB
• Stars: 4
• Watchers: 1
• Forks: 0
• Open Issues: 0
• Metadata Files:
  • Readme: README.md
  • License: LICENSE.md

Awesome Lists containing this project

README

          
# Mersge

Simple 3-way merge editor for the terminal

![Demo](./assets/demo.gif)

## Run

```mersge ```

## Usage

- ```Arrow Up``` - move up

- ```Arrow Down``` - move down

- ```L``` - accept local

- ```R``` - accept incoming

- ```W``` - write file

- ```Q``` - quit

 

## Build

```cargo build```

## Test

```cargo test```

## Todo

- vertical scrolling

- manual edit