# 
# 
# patch "roster_merge.cc"
#  from [d0dc66a725dc893ccee97e587bf1c78818bbf00e]
#    to [05aa0577783004e6a031b3dcd9c37a654f8c2657]
# 
============================================================
--- roster_merge.cc	d0dc66a725dc893ccee97e587bf1c78818bbf00e
+++ roster_merge.cc	05aa0577783004e6a031b3dcd9c37a654f8c2657
@@ -1449,6 +1449,7 @@
   suite->add(BOOST_TEST_CASE(&test_roster_merge_attr_lifecycle));
   suite->add(BOOST_TEST_CASE(&test_scalar_merges));
   suite->add(BOOST_TEST_CASE(&test_simple_rename_target_conflict));
+  suite->add(BOOST_TEST_CASE(&test_simple_dir_loop_conflict));
 }
 
 #endif // BUILD_UNIT_TESTS