]> CyberLeo.Net >> Repos - FreeBSD/stable/10.git/commit
projects / FreeBSD / stable / 10.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 0bf6506) | patch
MFC: r258456
authorbrooks <brooks@ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f>
Tue, 26 Nov 2013 16:13:48 +0000 (16:13 +0000)
committerbrooks <brooks@ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f>
Tue, 26 Nov 2013 16:13:48 +0000 (16:13 +0000)
commitbd3e81bc0338694c029a2e5375dfb8a354c4192f
tree6f97e8d0f6c843deacfc43d4c42f4526de0ba2f5tree | snapshot
parent0bf6506d66571e49290092001f90c44730dd24bbcommit | diff
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)

git-svn-id: svn://svn.freebsd.org/base/stable/10@258657 ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f
usr.sbin/mergemaster/mergemaster.sh diff | blob | history
10-STABLE