Doug Barton c9bb666937 Make it more clear in the docs that -a is not compatible with -iFU, ...

and enforce this in the code. Apparently a lot of users mistakenly
combine -a with these flags and are then mystified that no changes
were made.

While I'm here, fix a trailing space in mergemaster.8

2010-03-14 05:22:46 +00:00

..

Makefile

…

mergemaster.8

Make it more clear in the docs that -a is not compatible with -iFU,

2010-03-14 05:22:46 +00:00

mergemaster.sh

Make it more clear in the docs that -a is not compatible with -iFU,

2010-03-14 05:22:46 +00:00