summaryrefslogtreecommitdiffstats
path: root/usr.sbin/mergemaster
diff options
context:
space:
mode:
authoremaste <emaste@FreeBSD.org>2010-01-22 16:05:10 +0000
committeremaste <emaste@FreeBSD.org>2010-01-22 16:05:10 +0000
commitf907bb85100c4acac04705abd5dba080f858fffb (patch)
tree7d18c9c34b073325b20d75be87cc861d77509cc0 /usr.sbin/mergemaster
parent3fd28198182dca18f62ac1e2ffad3502926699a3 (diff)
downloadFreeBSD-src-f907bb85100c4acac04705abd5dba080f858fffb.zip
FreeBSD-src-f907bb85100c4acac04705abd5dba080f858fffb.tar.gz
Add H55 ID from Mike Tancsa, with minor rewording from avg@.
PR: kern/143068 Submitted by: Mike Tancsa (Sentex) MFC after: 1 week
Diffstat (limited to 'usr.sbin/mergemaster')
0 files changed, 0 insertions, 0 deletions
OpenPOWER on IntegriCloud