Hello *nix specialists,
Im working for a non profit organisation in Germany to transport DSL over WLAN to people in areas without no DSL. We are using Linksys WRT 54 router with DD-WRT firmware There are at the moment over 180 router running but we have to change some settings next time. So my... (7 Replies)
Hi Guys,
I have an issue whereby I package up an rpm and when I deploy it, the binary filesizes differ from what I packaged up from the SOURCE directory.
from source - -rwxrwxr-x 1 user group 685156 Sep 26 15:50 cybAgent.bin
after install - -rwxr-xr-x 1 user group 683388 Oct 16 11:10... (4 Replies)
I currently have a shell script that utilizes the "Date" binary - this application is slightly different on OS X (BSD General Commmand) and Linux systems (gnu date). In particular, the version on OS X requires the following to get a date 14 days in the future "date -v+14d -u +%Y-%m-%d" where gnu... (1 Reply)
Hi,
I would like to know what is command or script to determine the a directory that seat on a logical volume and mount-point.
For example:
logical volume mount-point
------------ -------------
/dev/vg00/scenario /training/test
/dev/vg00/train ... (2 Replies)
Hi,
Anyone got a clue? is there some tool for it? couldnt find it in apt get, anyway i hope so cos i must build a patch management tool for work:P
Greetz. (10 Replies)
Hi Folks,
Is there anyway I can determine the package set (or SIP) that a package belongs to. It doesn't seem that pkginfo does it?? I'm trying to remove a whole lot of unecessary packages, and it would be far more convenient if I could remove whole sets at a time instead of indivdual packages.... (0 Replies)
Hello,
How to i determine via ftp commandline if files on ftp server is ascii or binary files. Like every other comon windows ftp program does it automatically.
regards
Thomas (5 Replies)
let I executed the following command:
ls -lrt mdase mvfile test | grep '\.xml'
the output is :
-rw-r--r-- 1 surjya other 0 Sep 23 16:25 sample.xml
-rw-r--r-- 1 surjya other 0 Oct 5 16:11 tst2.xml
-rw-r--r-- 1 surjya other 0 Oct 5 16:12 test3.xml... (1 Reply)
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)