[Monotone-commits-diffs] Revision d65d403b33c026ec3315a6d8636d3b2e79b06476

[monotone]

-----------------------------------------------------------------
Revision: d65d403b33c026ec3315a6d8636d3b2e79b06476
Ancestor: b395e92f53b2f6a3d2095701f8f3b69db27ccb66
Author: address@hidden
Date: 2006-02-23T09:13:19
Branch: net.venge.monotone

Renamed entries:
        tests/t_log_nofiles_merges.at to tests/t_log_nofiles_nomerges.at
Modified files:
        ChangeLog app_state.cc app_state.hh commands.cc
        contrib/color-logs.conf contrib/color-logs.sh
        contrib/monotone-notify.pl contrib/monotone.el monotone.cc
        monotone.texi options.hh tests/t_log_nofiles_nomerges.at
        testsuite.at

ChangeLog: 

2006-02-23  Matthew Gregan  <address@hidden>

        * app_state.cc, app_state.hh, commands.cc, monotone.cc,
        options.hh: Revert failed UI experiment: reenable logging merges
        by default and rename --merges back to --no-merges.

        * contrib/color-logs.{conf,sh}, contrib/monotone-notify.pl,
        contrib/monotone.el, tests/t_log_nofiles_nomerges.at,
        testsuite.at: Handle --no-merges.

        * monotone.texi: Document --no-merges.

txtGiEGizkidO.txt
Description: Diff [b395e92f53b2f6a3d2095701f8f3b69db27ccb66] -> [d65d403b33c026ec3315a6d8636d3b2e79b06476]