Index: mergemaster.sh
===================================================================
RCS file: /home/ncvs/src/usr.sbin/mergemaster/mergemaster.sh,v
retrieving revision 1.16
diff -u -r1.16 mergemaster.sh
--- mergemaster.sh	2000/11/09 00:19:21	1.16
+++ mergemaster.sh	2000/12/12 18:05:26
@@ -109,7 +109,17 @@
     if [ -f "${DESTDIR}${COMPFILE#.}" -a -f "${COMPFILE}" ]; then
       if [ "${HANDLE_COMPFILE}" = "v" -o "${HANDLE_COMPFILE}" = "V" ]; then
         (
+	  CVSCO=$(grep '\$FreeBSD:.*\$' "${DESTDIR}${COMPFILE#.}" | sed 's|.*\$FreeBSD:\([^\$]*\)\$.*|\1|' | awk '{print "co -p -r" $2 " /home/ncvs/" $1}')
+	  if [ "$CVSCO" != "co -p -r /home/ncvs" ]; then
+	  	$CVSCO > ${COMPFILE}.origcvs 2> /dev/null
+          fi
           echo ''
+	  if [ -e ${COMPFILE}.origcvs ] &&
+	     diff -q -I'.*\$FreeBSD.*\$.*' ${DESTDIR}${COMPFILE#.} ${COMPFILE}.origcvs \
+	        > /dev/null; then
+		echo "  *** Installed ${COMPFILE} is equal to original in CVS"
+	  fi
+          rm -f "${COMPFILE}.origcvs"
           echo "  *** Displaying differences between ${COMPFILE} and installed version:"
           echo ''
           diff "${DIFF_FLAG}" "${DESTDIR}${COMPFILE#.}" "${COMPFILE}"