diff options
author | brooks <brooks@FreeBSD.org> | 2013-11-26 16:13:48 +0000 |
---|---|---|
committer | brooks <brooks@FreeBSD.org> | 2013-11-26 16:13:48 +0000 |
commit | 4355776cd8cb93d5a5635fc739dcc3ecf5d1ccfd (patch) | |
tree | 6f97e8d0f6c843deacfc43d4c42f4526de0ba2f5 /lib/libc/net/hesiod.c | |
parent | c545463f87891b7cabcb279987652b0665a4135c (diff) | |
download | FreeBSD-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/net/hesiod.c')
0 files changed, 0 insertions, 0 deletions