Diff for /src/usr.sbin/mergemaster/mergemaster.sh between versions 1.4 and 1.5

version 1.4, 2003/07/28 06:28:23 version 1.5, 2003/12/16 15:03:51
Line 9 Line 9
 # DougB@FreeBSD.org  # DougB@FreeBSD.org
   
 # $FreeBSD: src/usr.sbin/mergemaster/mergemaster.sh,v 1.46 2003/05/03 06:35:19 dougb Exp $  # $FreeBSD: src/usr.sbin/mergemaster/mergemaster.sh,v 1.46 2003/05/03 06:35:19 dougb Exp $
# $DragonFly: src/usr.sbin/mergemaster/mergemaster.sh,v 1.3 2003/07/24 06:35:39 dillon Exp $# $DragonFly$
   
 PATH=/bin:/usr/bin:/usr/sbin  PATH=/bin:/usr/bin:/usr/sbin
   
Line 1044  esac Line 1044  esac
 case "${PRE_WORLD}" in  case "${PRE_WORLD}" in
 '') ;;  '') ;;
 *)  *)
  MAKE_CONF="${SOURCEDIR%etc}share/examples/etc/make.conf"  MAKE_CONF="${SOURCEDIR%etc}etc/defaults/make.conf"
   
   (echo ''    (echo ''
   echo '*** Comparing make variables'    echo '*** Comparing make variables'

Removed from v.1.4  
changed lines
  Added in v.1.5