summaryrefslogtreecommitdiffstats
path: root/lib/libc
diff options
context:
space:
mode:
authorbrooks <brooks@FreeBSD.org>2013-11-26 16:13:48 +0000
committerbrooks <brooks@FreeBSD.org>2013-11-26 16:13:48 +0000
commit4355776cd8cb93d5a5635fc739dcc3ecf5d1ccfd (patch)
tree6f97e8d0f6c843deacfc43d4c42f4526de0ba2f5 /lib/libc
parentc545463f87891b7cabcb279987652b0665a4135c (diff)
downloadFreeBSD-src-4355776cd8cb93d5a5635fc739dcc3ecf5d1ccfd.zip
FreeBSD-src-4355776cd8cb93d5a5635fc739dcc3ecf5d1ccfd.tar.gz
MFC: r258456
Fix mergemaster -U by forcing FreeBSD 9 compatiblity in mtree when mtree is nmtree. The mtree output used by mergemaster in this case was clearly not meant for computer consumption and an approach based on -f <file1> -f <file2> would probably be a better idea, but this is a minimal change. Approved by: re (glebius)
Diffstat (limited to 'lib/libc')
0 files changed, 0 insertions, 0 deletions
OpenPOWER on IntegriCloud