]> CyberLeo.Net >> Repos - FreeBSD/stable/8.git/commit
MFC r220512:
authordougb <dougb@ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f>
Wed, 13 Apr 2011 19:54:54 +0000 (19:54 +0000)
committerdougb <dougb@ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f>
Wed, 13 Apr 2011 19:54:54 +0000 (19:54 +0000)
commit612e4cc78db2d7b3de9e6fa8113b9d2b395b1bd7
tree6c28216b60892f797293f9b8ea772f35f9a0b4af
parent39643bffd935d341454be7329fdcd741126b1cf3
MFC r220512:

Update recommendation for mergemaster. The -a and -i options are exclusive.

git-svn-id: svn://svn.freebsd.org/base/stable/8@220608 ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f
Makefile