- Colorized the merge process. - Added whitespace to the merge output for alignment and a less cramped look. - De-tabbed. - Changed "(*foo).method ()" to "foo->method ()" or clarity. - Removed two tests that relied upon the (removed) "Redo" message.
- Colorized the merge process. - Added whitespace to the merge output for alignment and a less cramped look. - De-tabbed. - Changed "(*foo).method ()" to "foo->method ()" or clarity. - Removed two tests that relied upon the (removed) "Redo" message.