3 More Discussions You Might Find Interesting
1. What is on Your Mind?
Hey!
I'm thinking we should change the toolbar to "opt in" and have it off for members by default?
But then, the would not have toolbar access to the code tag videos, etc. so then I thought to make it "opt in" after say 30 posts. That way, the toolbar will show to all new users with less... (5 Replies)
Discussion started by: Neo
5 Replies
2. What is on Your Mind?
Well, it's been a few months now since we started running the toolbar on the bottom with some navigation menu, search, link to code tag video, some social networking tools, etc.
So, the question of the day is:
Should we keep it, maybe develop more toolbar apps, or dump it?
Please vote ... (13 Replies)
Discussion started by: Neo
13 Replies
3. UNIX for Dummies Questions & Answers
Hi all,
I am trying to set some icons in the toolbar thingy (HP-UX 10.2). I used the Toolboxes->Personal to help me setup, but it put the program icon in the personal toolbox folder. So I dragged it out to the Desktop. Now I've a link on a Desktop. Any ideas on how to create directly on to... (2 Replies)
Discussion started by: nitin
2 Replies
LEARN ABOUT DEBIAN
imediff2
IMEDIFF2(1) IMEDIFF2(1)
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 be-
tween 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 dis-
plays 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.
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.
2006-03-10 IMEDIFF2(1)