Mercurial > hg
changeset 3250:7c114915fbdb
Make status -C work with merge+rename
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Wed, 04 Oct 2006 17:59:27 -0500 |
parents | f05c182430a0 |
children | c93ce7f10f85 |
files | mercurial/commands.py |
diffstat | 1 files changed, 1 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/mercurial/commands.py Wed Oct 04 15:43:27 2006 -0500 +++ b/mercurial/commands.py Wed Oct 04 17:59:27 2006 -0500 @@ -2532,8 +2532,7 @@ for f in changes: ui.write(format % f) - if ((all or opts.get('copies')) and not opts.get('no_status') - and opt == 'added'): + if ((all or opts.get('copies')) and not opts.get('no_status')): copied = repo.dirstate.copied(f) if copied: ui.write(' %s%s' % (copied, end))