This commit is contained in:
laerus 2016-08-24 04:46:40 +03:00
parent 05cc6c39e8
commit f59619c90b

View file

@ -553,7 +553,7 @@ def load_foreign_aliases(shells=None, config=None, issue_warning=True):
else: else:
del shaliases[alias] del shaliases[alias]
print('aliases: alias {!r} of shell {!r} ' print('aliases: alias {!r} of shell {!r} '
'tries to override xonsh builtin alias, ' 'tries to override xonsh alias, '
'xonsh wins!'.format(alias, shell['shell']), 'xonsh wins!'.format(alias, shell['shell']),
file=sys.stderr) file=sys.stderr)
aliases.update(shaliases) aliases.update(shaliases)