DataMuseum.dk

Presents historical artifacts from the history of:

Commodore CBM-900

This is an automatic "excavation" of a thematic subset of
artifacts from Datamuseum.dk's BitArchive.

See our Wiki for more about Commodore CBM-900

Excavated with: AutoArchaeologist - Free & Open Source Software.

top - download

⟦7ce418a2c⟧ TextFile

    Length: 473 (0x1d9)
    Types: TextFile
    Notes: UNIX file
    Names: »diff3«

Derivation

└─⟦eafc30061⟧ Bits:30001199 Commodore 900 hard disk image
    └─⟦8281d0872⟧ UNIX Filesystem
        └─ ⟦5daf77bc8⟧ »vol2.fd« UNIX Filesystem
            └─ ⟦this⟧ »bin/diff3« 
└─⟦eafc30061⟧ Bits:30001199 Commodore 900 hard disk image
    └─⟦5ec4c54f2⟧ UNIX Filesystem
        └─ ⟦this⟧ »bin/diff3« 
└─⟦f27320a65⟧ Bits:30001972 Commodore 900 hard disk image with partial source code
    └─⟦926b8033d⟧ UNIX Filesystem
        └─ ⟦this⟧ »bin/diff3«

TextFile

:
: 'Diff3 - run two diffs, then merge their'
: 'results'
unique=$$

case "$1" in
-* )
	flag=$1
	shift
esac

case $# in
3)
	;;
*)
	echo Usage: diff3 [-ex3] file1 file2 file3
	exit 2
esac

trap 'rm /tmp/d3${unique}[ab]; exit 2' 1 2 3 5

diff -d $1 $3 >/tmp/d3${unique}a

case $? in
[01])
	diff -d $2 $3 >/tmp/d3${unique}b
	;;

*)
	rm /tmp/d3${unique}[ab]
	exit 2
esac

case $? in
[01])
	/usr/lib/diff3 $flag /tmp/d3${unique}
esac

stat=$?
rm /tmp/d3${unique}[ab]
exit $stat