# 
# 
# patch "ChangeLog"
#  from [d95ea855cd5ded50f9f4d62bd4781ae67dd1b4e4]
#    to [ddd59ee787c58fd0a0992af9b73e6c2e0fd769ac]
# 
# patch "lua.cc"
#  from [b2a3ac1c0d97220cf47871563c46be7b6e27a1fe]
#    to [a83954e49ad8c287a39fa67408404ecac0ac7547]
# 
# patch "lua.hh"
#  from [bcfc2e328c34272f77440bcb7e67f854b8f87f1f]
#    to [532576dfba2360ab279d69e936455e5ee9f32427]
# 
============================================================
--- ChangeLog	d95ea855cd5ded50f9f4d62bd4781ae67dd1b4e4
+++ ChangeLog	ddd59ee787c58fd0a0992af9b73e6c2e0fd769ac
@@ -1,5 +1,10 @@
 2006-01-10  Nathaniel Smith  <address@hidden>
 
+	* lua.{cc,hh} (hook_resolve_file_conflict)
+	(hook_resolve_dir_conflict): Remove dead code.
+
+2006-01-10  Nathaniel Smith  <address@hidden>
+
 	* tests/t_selectors_b_h.at, testsuite.at: New test.
 
 2006-01-10  Nathaniel Smith  <address@hidden>
============================================================
--- lua.cc	b2a3ac1c0d97220cf47871563c46be7b6e27a1fe
+++ lua.cc	a83954e49ad8c287a39fa67408404ecac0ac7547
@@ -1221,44 +1221,6 @@
   return ok;
 }
 
-bool 
-lua_hooks::hook_resolve_file_conflict(file_path const & anc,
-                                      file_path const & a,
-                                      file_path const & b,
-                                      file_path & res)
-{
-  string tmp;
-  bool ok = Lua(st)
-    .func("resolve_file_conflict")
-    .push_str(anc.as_external())
-    .push_str(a.as_external())
-    .push_str(b.as_external())
-    .call(3,1)
-    .extract_str(tmp)
-    .ok();
-  res = file_path_internal(tmp);
-  return ok;
-}
-
-bool 
-lua_hooks::hook_resolve_dir_conflict(file_path const & anc,
-                                     file_path const & a,
-                                     file_path const & b,
-                                     file_path & res)
-{
-  string tmp;
-  bool ok = Lua(st)
-    .func("resolve_dir_conflict")
-    .push_str(anc.as_external())
-    .push_str(a.as_external())
-    .push_str(b.as_external())
-    .call(3,1)
-    .extract_str(tmp)
-    .ok();
-  res = file_path_internal(tmp);
-  return ok;  
-}
-
 bool
 lua_hooks::hook_external_diff(file_path const & path,
                               data const & data_old,
============================================================
--- lua.hh	bcfc2e328c34272f77440bcb7e67f854b8f87f1f
+++ lua.hh	532576dfba2360ab279d69e936455e5ee9f32427
@@ -88,16 +88,6 @@
                    data const & right, 
                    data & result);
 
-  bool hook_resolve_file_conflict(file_path const & anc,
-                                  file_path const & a,
-                                  file_path const & b,
-                                  file_path & res);
-
-  bool hook_resolve_dir_conflict(file_path const & anc,
-                                 file_path const & a,
-                                 file_path const & b,
-                                 file_path & res);
-
   bool hook_external_diff(file_path const & path,
                           data const & data_old,
                           data const & data_new,