Comment 14 for bug 322767

Another aspect of the same problem can be seen in bug #414589.

The rule should be that bzr should *at least* warn (optionally loudly) if files, generated by bzr for conflict resolution purposes, are added or committed (#414589 is about add only).