8 More Discussions You Might Find Interesting
1. What is on Your Mind?
Hello,
Long-time Unix hacker here - I've worked on four variants of the kernel prior to the introduction of Linux. In my spare time, I've written Linux (Ubuntu) device drivers, kernel modules, cross-compiled, and built the kernel.
I'd like to do Linux internals/device drivers as a day job,... (1 Reply)
Discussion started by: OriginalVersion
1 Replies
2. UNIX for Advanced & Expert Users
When we put a breakpoint using gcc then what all things happen internally and how the gdb using break is able to pause the execution of process( instead of killing it ) and later on resume the process execution? (0 Replies)
Discussion started by: rupeshkp728
0 Replies
3. Programming
hey all, im a new programmer.
i was wondering how you would go about writing the printf function yourself? it is my understanding that when you call printf you are calling an already written function and just providing an argument? if this is the case, is it possible to write that function... (8 Replies)
Discussion started by: Christian.B
8 Replies
4. Programming
Hello Gurus,
i am ok with the concepts of c language but i would like to know
more about the internals of c with respect to the compilers
what happens when we say
gcc filename.c
the a.out will get created(what actaully compiler does to the code inaddition to generating object code)
... (5 Replies)
Discussion started by: MrUser
5 Replies
5. BSD
FreeBSD Kernel Internals, Dr. Marshall Kirk McKusick
nwbqBdghh6E
The first hour of Marshall Kirk McKusick's course on FreeBSD kernel internals based on his book, The Design and Implementation of the FreeBSD Operating System. (0 Replies)
Discussion started by: Neo
0 Replies
6. HP-UX
. (2 Replies)
Discussion started by: Driver
2 Replies
7. Filesystems, Disks and Memory
will anybody tell me how can i access all the fields of process table .if there is any structure and a system call please specify . (1 Reply)
Discussion started by: vish_shan
1 Replies
8. New to Unix. Which books should I read?
Hi!
I have 1.5 years experience in unix environment and shell scripting. Now, I started learning UNIX internals and network programming. Can you please help in finding the same material on the net
Thanks
Srinivas. (7 Replies)
Discussion started by: srinivaskathika
7 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)