conflicts'i güzel göster, geri kalan değişiklikler emacs'in trailing whitespace'i silmesi, yürü be

2006-07-17 19:06:27 +00:00
parent 6d4652f94f
commit 5e7147f245
1 changed files with 23 additions and 23 deletions
@@ -164,7 +164,7 @@ class Install(AtomicOperation):
        if file_conflicts:
            file_conflicts_str = ""
            for (pkg, existing_file) in file_conflicts:
-                file_conflicts_str += _("%s from %s package") % (existing_file.path, pkg)
+                file_conflicts_str += _("/%s from %s package\n") % (existing_file.path, pkg)
            msg = _('File conflicts:\n%s') % file_conflicts_str
            if self.ignore_file_conflicts:
                ctx.ui.warning(msg)