1. Konstantine Rybnikov
  2. hgfilemerge

Commits

Konstantine Rybnikov  committed f5ba177

minor fix

  • Participants
  • Parent commits 76c7951
  • Branches default

Comments (0)

Files changed (1)

File __init__.py

View file
         
         ret_val = []
         for filename in self.merge_groups[group_name].files:
-            with codecs.open(os.path.join(self.base_path, filename), 'r', 'utf-8') as f:
+            with codecs.open(
+                os.path.join(self.base_path,
+                             os.path.join(self.merge_groups[group_name].prefix,
+                                          filename)), 'r', 'utf-8') as f:
                 ret_val += f.readlines()
         return ret_val