[MERGE] whitespace normalization

[Gary Wilson Jr.]

Colin D Bennett wrote:
> Perhaps for projects just starting out, implementing a Bazaar pre-commit
> hook to re-indent all files before being committed would be nice.  This
> way things would just stay consistent.  However, for Bazaar, we have a
> lot of code and lots of people working on stuff, upon whom we don't
> want to cast undue merge pain.

Merging pain could be avoided if all bzr branch authors picked a day and 
ran a trailing-whitespace-removal tool on all their branches :)

Or what about something like a merge --no-eol-space option that removed 
trailing whitespace from both sides of the merge for every file involved 
in the merge?  Seems that could stop the eol-white-space-only conflicts 
before they have a chance to meet and would clean things up as files get 
committed.

Gary