2 # $Id: merge.sh,v 1.1 1993/03/21 09:58:06 cgd Exp $
6 DIFF3
=/usr
/local
/lib
/rdiff3
16 echo >&2 "merge: usage: merge [-p] file1 file2 file3"
24 echo >&2 "$1 not writeable"
29 trap 's=$?; rm -f /tmp/d3a$$ /tmp/d3b$$; exit $s' 0
33 $DIFF $1 $3 >/tmp
/d3a$$
39 $DIFF $2 $3 >/tmp
/d3b$$
46 $DIFF3 -E /tmp
/d3a$$
/tmp
/d3b$$
$1 $2 $3 $4 $5
49 1) echo >&2 merge
: warning
: 1 overlap during merge.
;;
50 *) echo >&2 merge
: warning
: $? overlaps during merge.