05-05-2013
Had mine for months, still in its box. Not even powered it up yet...
I have thought about getting AROS working on it to give the AMIGA feel.
Still using my Arduino Diecimila boards for fun...
10 More Discussions You Might Find Interesting
1. What is on Your Mind?
Hi guys,
My name is Ryan. I'm from Providence, Rhode Island. A friend and I are working on a homemade video game cabinet design in the style of classic arcade games from the late seventies to nineties. We're designing a system that allows people to play these original games on their original... (0 Replies)
Discussion started by: kabungalee
0 Replies
2. What is on Your Mind?
Raspberry Pi
An ARM GNU/Linux box for $25. Take a byte!
FAQs
What's a Raspberry Pi?
The Raspberry Pi is a credit-card sized computer that plugs into your TV and a keyboard. It's a capable little PC which can be used for many of the things that your desktop PC does, like spreadsheets,... (5 Replies)
Discussion started by: Neo
5 Replies
3. What is on Your Mind?
Anyone order or get the new Rasberry Pi? I'm still waiting. Even though it's a fun project, I think these will turn out to be toys for people who already have PC's, and a boon to those who do not.
But that is not stopping me. If my wallet holds out, maybe I can build a Raspberry Pi beowulf... (1 Reply)
Discussion started by: jim mcnamara
1 Replies
4. AIX
Anybody done it? We use a legacy application that requires 3151 emulation. I am experimenting with a raspberry Pi running Debian. Wondering if nothing else, somebody might know where I can get some source code for a basic emulator? (1 Reply)
Discussion started by: jeveretts
1 Replies
5. Debian
Raspberry Pi B 2014-01-07 Raspbian fully up to date.
Installed and configured motion for surveillance.
It works just fine and creates .avi files and .jpeg.
Installed Mplayer trying to run it from desktop was
not successful. I did try to do a command line by
executing sudo mplayer... (6 Replies)
Discussion started by: oldcity
6 Replies
6. News, Links, Events and Announcements
Not sure if this is the right forum...
But a mini Raspberry PI, Raspberry PI Zero, free with MagPI magazine...
Shrinking to Zero: The Raspberry Pi gets smaller - BBC News
Fantastic for a simple Raspbian Debian based project... (0 Replies)
Discussion started by: wisecracker
0 Replies
7. News, Links, Events and Announcements
Hi all...
An interesting idea for Raspberry Pi...
Raspberry Pi goes Hi-Fi with audio valve amp | Electronics Weekly
Enjoy... (1 Reply)
Discussion started by: wisecracker
1 Replies
8. UNIX for Beginners Questions & Answers
i have been given a raspberry Pi with some applications i am told run in Unix. I do not know much (close to nothing about Unix) that's why I'm here.
I need someone to remote view (team viewer) into my machine and try and show me how to get this application running.
If there is success there... (1 Reply)
Discussion started by: supaflygy
1 Replies
9. Shell Programming and Scripting
Hi,
I'm trying to get the configuration just as I'd like. But I can't get it to work?
I try to read if: xset s off xset -dpms xset s noblank
Is already in the .xinitrc file.... but it doesn't seem to work. I need it to check if it is already in the file otherwise it should echo that it's... (2 Replies)
Discussion started by: melbarius
2 Replies
10. Emergency UNIX and Linux Support
This is a test to see if the Emergency and UNIX and Linux Support forum is still working...
I see that Amazon has a deal on Raspberry Pis today (CanaKit Raspberry Pi 3 B+ (B Plus) Starter Kit (32 GB EVO+ Edition, Premium Black Case) and CanaKit Raspberry Pi 3 Complete Starter Kit - 32 GB... (4 Replies)
Discussion started by: Don Cragun
4 Replies
DIFF3(1) GNU Tools DIFF3(1)
NAME
diff3 - find differences between three files
SYNOPSIS
diff3 [options] mine older yours
DESCRIPTION
The diff3 command compares three files and outputs descriptions of their differences.
The files to compare are mine, older, and yours. At most one of these three file names may be -, which tells diff3 to read the standard
input for that file.
Options
Below is a summary of all of the options that GNU diff3 accepts. Multiple single letter options (unless they take an argument) can be com-
bined into a single command line argument.
-a Treat all files as text and compare them line-by-line, even if they do not appear to be text.
-A Incorporate all changes from older to yours into mine, surrounding all conflicts with bracket lines.
-B Old behavior of -A. Shows non-conflicts.
-e Generate an ed script that incorporates all the changes from older to yours into mine.
-E Like -e, except bracket lines from overlapping changes' first and third files. With -e, an overlapping change looks like this:
<<<<<<< mine
lines from mine
=======
lines from yours
>>>>>>> yours
--ed Generate an ed script that incorporates all the changes from older to yours into mine.
--easy-only
Like -e, except output only the nonoverlapping changes.
-i Generate w and q commands at the end of the ed script for System V compatibility. This option must be combined with one of the
-AeExX3 options, and may not be combined with -m.
--initial-tab
Output a tab rather than two spaces before the text of a line in normal format. This causes the alignment of tabs in the line to
look normal.
-L label
--label=label
Use the label label for the brackets output by the -A, -E and -X options. This option may be given up to three times, one for each
input file. The default labels are the names of the input files. Thus diff3 -L X -L Y -L Z -m A B C acts like diff3 -m A B C ,
except that the output looks like it came from files named X, Y and Z rather than from files named A, B and C.
-m
--merge
Apply the edit script to the first file and send the result to standard output. Unlike piping the output from diff3 to ed, this
works even for binary files and incomplete lines. -A is assumed if no edit script option is specified.
--overlap-only
Like -e, except output only the overlapping changes.
--show-all
Incorporate all unmerged changes from older to yours into mine, surrounding all overlapping changes with bracket lines.
--show-overlap
Like -e, except bracket lines from overlapping changes' first and third files.
-T Output a tab rather than two spaces before the text of a line in normal format. This causes the alignment of tabs in the line to
look normal.
--text Treat all files as text and compare them line-by-line, even if they do not appear to be text.
-v
--version
Output the version number of diff3.
-x Like -e, except output only the overlapping changes.
-X Like -E, except output only the overlapping changes. In other words, like -x, except bracket changes as in -E.
-3 Like -e, except output only the nonoverlapping changes.
SEE ALSO
cmp(1), comm(1), diff(1), ed(1), patch(1), sdiff(1).
DIAGNOSTICS
An exit status of 0 means diff3 was successful, 1 means some conflicts were found, and 2 means trouble.
GNU Tools 22sep1993 DIFF3(1)