changeset 26812 | 58a309e9cf80 |
parent 26587 | 56b2bcea2529 |
child 28409 | c43c5e7167a2 |
--- a/hgext/convert/convcmd.py Mon Oct 19 16:29:35 2015 +0200 +++ b/hgext/convert/convcmd.py Mon Oct 19 16:49:54 2015 +0200 @@ -440,7 +440,7 @@ try: parents = self.splicemap[rev] self.ui.status(_('spliced in %s as parents of %s\n') % - (parents, rev)) + (_(' and ').join(parents), rev)) parents = [self.map.get(p, p) for p in parents] except KeyError: parents = [b[0] for b in pbranches]