cvs commit: src/usr.sbin/mergemaster mergemaster.sh

[Eirik Nygaard <eirikn@xxxxxxxxxxxxxxxxxxxxxxx>]

eirikn      2003/12/16 07:03:52 PST

DragonFly src repository

  Modified files:
    usr.sbin/mergemaster mergemaster.sh 
  Log:
   * Let mergemaster look for make.conf in the correct path.
  
  Submitted-by: Erik Paulsen Skaalerud <erik@xxxxxxxxxxxx>
  
  Revision  Changes    Path
  1.5       +2 -2      src/usr.sbin/mergemaster/mergemaster.sh


http://www.dragonflybsd.org/cvsweb/src/usr.sbin/mergemaster/mergemaster.sh.diff?r1=1.4&r2=1.5&f=h