#
#
# patch "cmd_diff_log.cc"
#  from [bd55c33e185979f03a6e5fe2d32188fac1dc0676]
#    to [ad4d4cafa86651204fdf5031adb737e95f80c4da]
# 
# patch "tests/merge_into_workspace/expected-log"
#  from [bb54916130033dda957988c62b47da01a62f8003]
#    to [77915a878636ca16ee32f5385d88a7dc8bd0054a]
# 
# patch "tests/merge_into_workspace/expected-log-left"
#  from [af5ce89ebb99fce921a967cdf34558b075ca6e5a]
#    to [6f396f4e143f0b58ef18131c13549622eea39cfb]
#
============================================================
--- cmd_diff_log.cc	bd55c33e185979f03a6e5fe2d32188fac1dc0676
+++ cmd_diff_log.cc	ad4d4cafa86651204fdf5031adb737e95f80c4da
@@ -101,7 +101,9 @@ print_indented_set(ostream & os,
   for (set<file_path>::const_iterator i = s.begin();
        i != s.end(); i++)
     {
-      const string str = lexical_cast<string>(*i);
+      string str = lexical_cast<string>(*i);
+      if (str.empty())
+        str = "."; // project root
       if (cols > 8 && cols + str.size() + 1 >= max_cols)
         {
           cols = 8;
============================================================
--- tests/merge_into_workspace/expected-log	bb54916130033dda957988c62b47da01a62f8003
+++ tests/merge_into_workspace/expected-log	77915a878636ca16ee32f5385d88a7dc8bd0054a
@@ -36,7 +36,7 @@ Added directories:
 Added files:
         otherfile testfile
 Added directories:
-        
+        .
 
 ChangeLog: 
 
============================================================
--- tests/merge_into_workspace/expected-log-left	af5ce89ebb99fce921a967cdf34558b075ca6e5a
+++ tests/merge_into_workspace/expected-log-left	6f396f4e143f0b58ef18131c13549622eea39cfb
@@ -22,7 +22,7 @@ Added directories:
 Added files:
         otherfile testfile
 Added directories:
-        
+        .
 
 ChangeLog: