EnglishFrenchSpanish

Ad


OnWorks favicon

imediff2 - Online in the Cloud

Run imediff2 in OnWorks free hosting provider over Ubuntu Online, Fedora Online, Windows online emulator or MAC OS online emulator

This is the command imediff2 that can be run in the OnWorks free hosting provider using one of our multiple free online workstations such as Ubuntu Online, Fedora Online, Windows online emulator or MAC OS online emulator

PROGRAM:

NAME


imediff2 - An interactive fullscreen 2-way merge tool

SYNOPSIS


imediff2 [-m] [-u] [-a] [-b] [-c] [-N new-file] [-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
Write output to given file. If missing, changes will not be saved.

-N, --new-file
Treat absent files as empty.

-m, --mono
Force monochrome display.

-u, --unresolved
Enable 'unresolved' mode (see above).

-a Start with version A (default).

-b Start with version B.

-c Start with unresolved changes (implies -u).

-h, --help
Show summary of options and exit.

-V, --version
Show version and exit.

KEYBOARD COMMANDS


The following keyboard commands are available in the editor.

h, ? Show commands.

up, down, left, right
Move in document.

page up, page down
Move a screenfull.

enter Toggle selected change.

n, tab, space
Jump to next change.

p Jump to previous change.

a Set current chunk to version A.

b Set current chunk to version B.

u Set current chunk to unresolved.

shift+a
Set all changes to version A.

shift+b
Set all changes to version B.

shift+u
Set all changes to unresolved.

e Launch external editor.

r Discard editor-made changes. (Available only after e.)

x, s Save and exit.

q, ctrl+c
Exit without saving.

home, end
Jump to start or end.

Use imediff2 online using onworks.net services


Ad