Skip to content

martinstarman/mersge

Folders and files

NameName
Last commit message
Last commit date

Latest commit

 

History

4 Commits
 
 
 
 
 
 
 
 
 
 
 
 
 
 

Repository files navigation

Mersge

Simple 3-way merge editor for the terminal

Demo

Run

mersge <file>

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

Releases

No releases published

Packages

No packages published

Languages