[11969] in Athena Bugs
sun4 7.6R: /usr/athena/bin/merge
daemon@ATHENA.MIT.EDU (rseto@MIT.EDU)
Tue Apr 19 12:25:43 1994
From: rseto@MIT.EDU
To: bugs@MIT.EDU
Cc: rseto@MIT.EDU
Date: Tue, 19 Apr 94 12:25:33 EDT
System name: m37-312-21
Type and version: SPARC/Classic 7.6R
Display type: cgthree
What were you trying to do?
I was trying to run /usr/athena/bin/rcsmerge.
What's wrong:
I get the following complaint:
~/thesis/dp>!rcsmerge
rcsmerge -r1.3 -r1.1 array.h
RCS file: RCS/array.h,v
retrieving revision 1.3
retrieving revision 1.1
Merging differences between 1.3 and 1.1 into array.h
/usr/athena/bin/merge: /usr/lib/diff3: not found
Warning: 1 overlaps during merge.
There was no change to array.h.
What should have happened:
Apparently rcsmerge calls the /usr/athena/bin/merge script,
which fails because its second line (DIFF3=/usr/lib/diff3)
references a nonexistent file. Can this be changed to point
to a working diff3?
Please describe any relevant documentation references:
man 1 merge, man 1L rcsmerge
