git: Revert "Remove mergemaster(8)."

[Sascha Wildner]

commit c39206e83e57e94d5ce2b987d22f69c73a8f847a
Author: Sascha Wildner <saw at online.de>
Date:   Wed Jan 25 19:35:25 2012 +0100

    Revert "Remove mergemaster(8)."
    
    This reverts commit 650094e10aa76969d99d60b3e506b55e4e2bf5fc.
    
    It is still being used by people.
    
    I thought mergemaster was only useful in conjunction with maintained
    CVS IDs. Should have known about its -s option.
    
    Requested-by: pavalos

Summary of changes:
 Makefile_upgrade.inc                |    3 -
 usr.sbin/Makefile                   |    1 +
 usr.sbin/mergemaster/Makefile       |    8 +
 usr.sbin/mergemaster/mergemaster.8  |  387 +++++++++++++
 usr.sbin/mergemaster/mergemaster.sh | 1065 +++++++++++++++++++++++++++++++++++
 5 files changed, 1461 insertions(+), 3 deletions(-)
 create mode 100644 usr.sbin/mergemaster/Makefile
 create mode 100644 usr.sbin/mergemaster/mergemaster.8
 create mode 100644 usr.sbin/mergemaster/mergemaster.sh

http://gitweb.dragonflybsd.org/dragonfly.git/commitdiff/c39206e83e57e94d5ce2b987d22f69c73a8f847a


-- 
DragonFly BSD source repository