Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 1 Jan 2009 12:09:57 +0000 (UTC)
From:      Doug Barton <dougb@FreeBSD.org>
To:        cvs-src-old@freebsd.org
Subject:   cvs commit: src/usr.sbin/mergemaster mergemaster.8
Message-ID:  <200901011210.n01CACKd010306@repoman.freebsd.org>

next in thread | raw e-mail | index | archive | help
dougb       2009-01-01 12:09:57 UTC

  FreeBSD src repository

  Modified files:
    usr.sbin/mergemaster mergemaster.8 
  Log:
  SVN rev 186679 on 2009-01-01 12:09:57Z by dougb
  
  General Improvements
  ====================
  1. List the command line options in a more standard way
  2. Improve the explanations of some of the arguments (-A, -D)
  3. Add ARCHSTRING and MTREEDB to the example rc file
  4. Re-sort some of the examples according to the existing distinction
  of "has a command line version" vs. "does not have a command line version"
  
  Document changes for r186678
  ===========================
  1. /usr/src/etc -> /usr/src where needed [1]
  2. Add IGNORE_FILES to the example rc [2] (and remove IGNORE_MOTD)
  3. Update the EXIT STATUS section for [3] and [4]
  
  Update Copyright and .Dd accordingly
  
  PR:             bin/96528 [1]
  Submitted by:   ru [1]
  PR:             bin/106642 [2]
  Submitted by:   Henrik Brix Andersen <henrik@brixandersen.dk>
  PR:             bin/122282 [3]
  Submitted by:   Eygene Ryabinkin <rea-fbsd@codelabs.ru> [3]
  PR:             bin/108183 [4]
  Submitted by:   Riccardo Torrini <riccardo@torrini.org> [4]
  
  Revision  Changes    Path
  1.38      +31 -19    src/usr.sbin/mergemaster/mergemaster.8



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200901011210.n01CACKd010306>