# 
# 
# patch "ChangeLog"
#  from [ecb41a60c0eb29dfea95e144a4dd89e86e1dc71e]
#    to [96ac221310f1e203ab5a8cea88f2d86c42e9904e]
# 
# patch "cmd_merging.cc"
#  from [b98e34e5f0f820fcadd105b56c91dd0ed7ffae66]
#    to [8adc4fca492eaf475dd1776f4a8f33bc5aded433]
# 
============================================================
--- ChangeLog	ecb41a60c0eb29dfea95e144a4dd89e86e1dc71e
+++ ChangeLog	96ac221310f1e203ab5a8cea88f2d86c42e9904e
@@ -1,3 +1,7 @@
+2006-05-24  Derek Scherger  <address@hidden>
+
+	* cmd_merging.cc (merge_into_dir): use the_null_node rather than 0
+
 2006-05-24  Matthew Gregan  <address@hidden>
 
 	* win32/get_system_flavour.cc: Report service pack number, if any
============================================================
--- cmd_merging.cc	b98e34e5f0f820fcadd105b56c91dd0ed7ffae66
+++ cmd_merging.cc	8adc4fca492eaf475dd1776f4a8f33bc5aded433
@@ -456,7 +456,7 @@
 
         {
           dir_t moved_root = left_roster.root();
-          moved_root->parent = 0;
+          moved_root->parent = the_null_node;
           moved_root->name = the_null_component;
         }