Bug#920810: ITP: imediff -- interactive full screen 2/3-way merge tool
- Date: Tue, 29 Jan 2019 23:40:00 +0900
- From: Osamu Aoki <osamu@xxxxxxxxxx>
- Subject: Bug#920810: ITP: imediff -- interactive full screen 2/3-way merge tool
Owner: Osamu Aoki <osamu@xxxxxxxxxx>
* Package name : imediff
Version : 2.0
Upstream Author : Osamu Aoki <osamu@xxxxxxxxxx>
* URL : https://github.com/osamuaoki/imediff
* License : GPL 2+
Programming Lang: Python3, shell
Description : interactive full screen 2/3-way merge tool
The imediff command helps you to merge 2 slightly different files with an
optional base file interactively using the in-place alternating display of
the changed content on a single-pane full screen terminal user interface.
The advantage of this user interface is the minimal movement of the line of
sight for the user. Other great tools such as vimdiff, xxdiff, meld and
kdiff3 require you to look at different points of display to find the exact
position of changes. This makes imediff the most stress-free tool.
Other great tools for merge such as "diff3 -m ..." and "git merge ..."
operate only on the difference by line. So even for the non-overlapping
changes, they yield the merge conflict if changes happen on the same line.
The automatic merge logic of the imediff command operates not only on the
difference by line but on the difference by character. This is another
great feature of the imediff command. So for the non-overlapping changes, it
always yields the clean merge.
This comes with git-ime script which helps you to split squished git commit
using imediff and with a support script to use imediff as the backend of
Old upstream: 2003-2004 Jarno Elonen <elonen@xxxxxx> in python2
New upstream: 2015-2018 Osamu Aoki <osamu@xxxxxxxxxx> in python3
The old upstream agreed to handover maintenance to me.
This prompted osamu to port code to python3 etc. and
changed its name from imediff2 to imediff since it now supports
This ITP is for uploading the new version 2.0 series (imediff).