The unified diff between revisions [8846a6b8..] and [ebdccab0..] is displayed below. It can also be downloaded as a raw diff.

This diff has been restricted to the following files: 'app_state.cc'

#
#
# patch "app_state.cc"
#  from [18045740e735562c70e3a482927003729014844f]
#    to [4990c26751504dded9cef9b1c6ffa66bef0d2b32]
#
============================================================
--- app_state.cc	18045740e735562c70e3a482927003729014844f
+++ app_state.cc	4990c26751504dded9cef9b1c6ffa66bef0d2b32
@@ -31,12 +31,12 @@ app_state::app_state()
 app_state::app_state()
   : branch_name(""), db(system_path()), keys(this), stdhooks(true),
     rcfiles(true), diffs(false),
-    merges(false), set_default(false), verbose(false), date_set(false),
+    no_merges(false), set_default(false), verbose(false), date_set(false),
     search_root("/"),
     depth(-1), last(-1), next(-1), diff_format(unified_diff), diff_args_provided(false),
     use_lca(false), execute(false), bind_address(""), bind_port(""),
     missing(false), unknown(false),
-    confdir(get_default_confdir()), have_set_key_dir(false)
+    confdir(get_default_confdir()), have_set_key_dir(false), no_files(false)
 {
   db.set_app(this);
   lua.set_app(this);