9 More Discussions You Might Find Interesting
1. UNIX for Beginners Questions & Answers
I am relatively new to 'older unix' systems but I am hoping someone can help me with the error I am seeing on my box. We have an Irix 6.5 running. Our computer keeps restarting (crashed once) itself, by itself, at random points in the last 5 out of 8 sessions. This is the sys log, that i took a... (0 Replies)
Discussion started by: pmccpete
0 Replies
2. UNIX for Advanced & Expert Users
Hi all ! I'm a french new owner of an Octane workstation with a R10000@195Mhz. I've find a release of IRIX 6.5 thanks to a friend but I've only the tree (files and repertories) on a hard drive with NTFS partition.
I try to burn the first installtion Cd (with the miniroot) on Windows Xp with Nero... (0 Replies)
Discussion started by: Nononsch
0 Replies
3. UNIX for Advanced & Expert Users
How to change icon of my application (say script file) in IRIX icon view. (1 Reply)
Discussion started by: kosta_mirkin
1 Replies
4. IP Networking
anyone available to help me config sgi octane to netscape and networking mac os X?
i have three macs and one sgi. setup on a dsl netopia router.
all 4 computers can ping each other by addresses and by names.
all the macs can ping the router, but the sgi cannot ping the router, "network is... (0 Replies)
Discussion started by: eidde
0 Replies
5. UNIX for Dummies Questions & Answers
I know that pushd/popd are built into csh, but I'm trying to run a set of 3rd party make files that use sh.
My problem is that sh simply squawks that pushd and popd are not found, then the make dies due to the error.
I've searched the entire system, and they are indeed missing. Evidently SGI... (3 Replies)
Discussion started by: jbalster
3 Replies
6. UNIX for Advanced & Expert Users
Hi,
I would like to add users to an IRIX system (SGI). Does anyone have any idea of how to add the user?
Is there a graphical interface like: admintool(SUN), sam(HPUX), or solstice(SUN) that does the function?
Thanks in advance, (1 Reply)
Discussion started by: vtran4270
1 Replies
7. UNIX for Dummies Questions & Answers
I have an SGI Indigo2 which I bought off of ebay.
It has Irix 6.5.15, but I am really not happy with this architecture and the proprietariness of SGI.
I have two hard drives.
Is it possible to install Redhat Linux on the second drive and run it on the Indigo2?
I used Unix in college a... (2 Replies)
Discussion started by: mdbanas
2 Replies
8. IP Networking
could anyone tell me how to network an sgi octane to a windows based machine. i am able to get internet access but the machines do not see each other on the network.
thanks :confused: (2 Replies)
Discussion started by: loleeg
2 Replies
9. IP Networking
I am trying to network an SGI running Irix 6.5 through an ethernet line to a PC running Windows 2000 (I have connected other PC's to this PC without any problems.) The PC has a DSL connection from Verizon that does not support Unix. I tried using DHCP on the SGI, but when I open a web browser on... (2 Replies)
Discussion started by: mdbanas
2 Replies
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)