- 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.
This commit is contained in:
Paul Beckingham 2010-10-15 00:18:58 -04:00
parent bb6f456e04
commit 783867c512
5 changed files with 71 additions and 27 deletions

View file

@ -711,6 +711,18 @@ Colors used by the undo command, to indicate the values both before and after
a change that is to be reverted.
.RE
.TP
.B color.sync.added=green
.RE
.br
.B color.sync.changed=yellow
.RE
.br
.B color.sync.rejected=red
.RS
Colors the output of the merge command.
.RE
.TP
.B rule.precedence.color=overdue,tag,project,keyword,active,...
.RS