[Midnightbsd-cvs] src: usr.sbin/mergemaster: update mergemaster based on freebsd 9.1

[laffer1 at midnightbsd.org]

Log Message:
-----------
update mergemaster based on freebsd 9.1 version.  Add M flag that checks for MidnightBSD ids

Modified Files:
--------------
    src/usr.sbin/mergemaster:
        Makefile (r1.2 -> r1.3)
        (http://cvsweb.midnightbsd.org/src/usr.sbin/mergemaster/Makefile?r1=1.2&r2=1.3)
        mergemaster.8 (r1.3 -> r1.4)
        (http://cvsweb.midnightbsd.org/src/usr.sbin/mergemaster/mergemaster.8?r1=1.3&r2=1.4)
        mergemaster.sh (r1.3 -> r1.4)
        (http://cvsweb.midnightbsd.org/src/usr.sbin/mergemaster/mergemaster.sh?r1=1.3&r2=1.4)