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
..
2010-03-05 21:39:16 +00:00
2010-02-15 14:29:17 +00:00
2010-02-26 09:41:16 +00:00
2010-02-26 09:41:16 +00:00
2010-01-15 16:01:22 +00:00
2010-03-02 16:58:04 +00:00
2009-01-30 15:28:56 +00:00
2009-11-02 12:35:38 +00:00
2009-04-28 20:20:13 +00:00
2009-01-06 14:23:38 +00:00
2010-02-19 14:27:32 +00:00
2010-02-26 09:41:16 +00:00
2010-02-20 10:19:19 +00:00
2009-05-29 22:19:45 +00:00
2010-01-03 22:29:06 +00:00
2010-01-16 12:20:26 +00:00
2010-01-03 15:32:25 +00:00
2010-01-15 16:01:22 +00:00
2010-02-25 19:47:47 +00:00
2010-01-09 15:37:24 +00:00
2010-01-10 19:21:23 +00:00