[Midnightbsd-cvs] [MidnightBSD/src] 019299: update mergemaster and moused

[Lucas Holt]

  Branch: refs/heads/master
  Home:   https://github.com/MidnightBSD/src
  Commit: 019299fa7d44e828e95c9e61a7424fd1e701ef6d
      https://github.com/MidnightBSD/src/commit/019299fa7d44e828e95c9e61a7424fd1e701ef6d
  Author: Lucas Holt <luke at foolishgames.com>
  Date:   2020-06-11 (Thu, 11 Jun 2020)

  Changed paths:
    M usr.sbin/mergemaster/mergemaster.sh
    M usr.sbin/moused/Makefile
    M usr.sbin/moused/moused.8
    M usr.sbin/moused/moused.c

  Log Message:
  -----------
  update mergemaster and moused