Update recommendation for mergemaster. The -a and -i options are exclusive. PR: docs/156271 Submitted by: Fedor Dikarev <fedor.dikarev@gmail.com>
head/Makefile