# 
# patch "work.cc"
#  from [f5372383f82285a8c53830f61169ff173216b50e]
#    to [414b20fde1be54d9073f40ccf4c8ed31f72db8e9]
# 
# patch "work.hh"
#  from [28f249939d5167934158388eaee8eed9a99f84f5]
#    to [268e0f4b8f2c804719d1c6b36eface5f65a3ec13]
# 
========================================================================
--- work.cc	f5372383f82285a8c53830f61169ff173216b50e
+++ work.cc	414b20fde1be54d9073f40ccf4c8ed31f72db8e9
@@ -681,10 +681,10 @@
 
 string const manual_merge_attribute("manual_merge");
 
-static bool find_in_attr_map(attr_map const & attr,
-                             file_path const & file,
-                             std::string const & attr_key,
-                             std::string & attr_val)
+bool find_in_attr_map(attr_map const & attr,
+                      file_path const & file,
+                      std::string const & attr_key,
+                      std::string & attr_val)
 {
   attr_map::const_iterator f = attr.find(file);
   if (f == attr.end())
========================================================================
--- work.hh	28f249939d5167934158388eaee8eed9a99f84f5
+++ work.hh	268e0f4b8f2c804719d1c6b36eface5f65a3ec13
@@ -184,6 +184,11 @@
                                      std::string const & attr_key,
                                      std::string & attr_val); 
 
+bool find_in_attr_map(attr_map const & attr,
+                      file_path const & file,
+                      std::string const & attr_key,
+                      std::string & attr_val);
+
 void update_any_attrs(app_state & app);
 
 extern std::string const binary_encoding;