# 
# patch "ChangeLog"
#  from [2fcba59571a67f31ac5ba4758ec0f20e46b28bc3]
#    to [de4922749888660f7aa043cd55e399028faae883]
# 
# patch "app_state.cc"
#  from [1e2cfd4af8c4ccc2b721c758469659dc3d7f4131]
#    to [fdd096f48a36c4a307949da3515c8b58ff66fda6]
# 
--- ChangeLog
+++ ChangeLog
@@ -1,5 +1,12 @@
 2005-06-26  Matthew Gregan  <address@hidden>
 
+	* app_state.cc (app_state::app_state()): Initialise no_merges to
+	false so that 'log' will show merges by default (the recently
+	added --no-merges option provides a means to disable the merge
+	entries).
+
+2005-06-26  Matthew Gregan  <address@hidden
+
 	* tests/t_automate_stdio.at, tests/t_cvsimport_drepper.at,
 	tests/t_selector_later_earlier.at: Further canonicalisation of
 	monotone output to resolve test failures on Win32.
--- app_state.cc
+++ app_state.cc
@@ -31,7 +31,7 @@
 
 app_state::app_state() 
   : branch_name(""), db(""), stdhooks(true), rcfiles(true), diffs(false),
-    verbose(false), search_root("/"), depth(-1), last(-1)
+    no_merges(false), verbose(false), search_root("/"), depth(-1), last(-1)
 {
   db.set_app(this);
 }