# HG changeset patch
# User Matt Mackall <mpm@selenic.com>
# Date 1160002767 18000
# Node ID 7c114915fbdb14f7b192550c1565c4d49d57c18e
# Parent  f05c182430a0128589aea34c5f5fa4106693234c
Make status -C work with merge+rename

diff -r f05c182430a0 -r 7c114915fbdb mercurial/commands.py
--- 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))