NAME¶

imediff2 - An interactive fullscreen 2-way merge tool

SYNOPSIS¶

imediff2 [-m] [-u] [-a] [-b] [-c] [-N] [-o outputfile] {file1} {file2}

DESCRIPTION¶

Merge two (slightly different) files interactively with a user friendly fullscreen interface in text mode.

Imediff2 shows the differences of given two files (in color if the terminal supports them), lets you scroll the file and toggle changes between old and new version one by one. If the 'unresolved' mode is enabled, you can optionally save both versions.

Additionally, if the $EDITOR environment variable is set or if /usr/bin/editor exists and is executable, you can also launch an external editor and manually edit the half-merged file before saving it, perhaps to resolve the 'unresolved' parts.

Empty lines are shown in reverse colors so you see that you can select them. If a line is missing completely from one file, imediff2 displays it as a reversed '?'. While it seems to take one line in the editing phase, it is naturally not saved into the output file.

To see a list of keyboard commands, hit h or ? in the editor.

The program exits with status 0 if the changes were saved, 1 if the merging was aborted and 2 if the parameters were invalid.

OPTIONS¶

-o outputfile, --output=outputfile

-N, --new-file

-m, --mono

-u, --unresolved

-a

-b

-c

-h, --help

-t, --template

-V, --version

KEYBOARD COMMANDS¶

The following keyboard commands are available in the editor as default.

h, ?

up, down, left, right

page up, page down

enter

n, tab, space

p

a

b

u

shift+a

shift+b

shift+u

e

r

x, s

q, ctrl+c

home, end

FILE¶

The key choices of the above keyboard commands can be configured in ~/.imediff2 which is created at the first execution of this command. The left side is the keys described in this manpage. The right side is your configuration choices. The current settings can be confirmed by the 'h' key dialog.

SEE ALSO¶

sdiff (1), diff (1), merge (1), diff3 (1).

COPYRIGHT¶

This manual page as well as the program itself was written by Jarno Elonen (<elonen@iki.fi>). Unlike the program itself, which is licensed under the GNU General Public License (GPL) version 2 (or any later version, at your option), this document has been placed into the Public Domain.

AUTHOR¶

Jarno Elonen

COPYRIGHT¶

Copyright © 2003-2006 elonen <elonen@iki.fi>