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.hh'

#
#
# patch "app_state.hh"
#  from [7fa51b357c748547e5d71dbc84fb35077c148177]
#    to [03afbc7ba543f0b26f8ddf70d97c05e872cdb36b]
#
============================================================
--- app_state.hh	7fa51b357c748547e5d71dbc84fb35077c148177
+++ app_state.hh	03afbc7ba543f0b26f8ddf70d97c05e872cdb36b
@@ -40,7 +40,7 @@ public:
   bool stdhooks;
   bool rcfiles;
   bool diffs;
-  bool merges;
+  bool no_merges;
   bool set_default;
   bool verbose;
   options_map options;
@@ -73,6 +73,7 @@ public:
   system_path confdir;
   bool have_set_key_dir;
   std::set<std::string> attrs_to_drop;
+  bool no_files;

   std::map<int, bool> explicit_option_map;  // set if the value of the flag was explicitly given on the command line
   void set_is_explicit_option (int option_id);