MFV r305100: Update amd from am-utils 6.1.5 to 6.2.
[freebsd.git] / usr.sbin / mergemaster /
drwxr-xr-x   ..
-rw-r--r-- 80 Makefile
-rw-r--r-- 176 Makefile.depend
-rw-r--r-- 13006 mergemaster.8
-rwxr-xr-x 40239 mergemaster.sh