branch | stable |
changeset 19482 | 499fc471296b |
parent 19476 | 4fed15d4c5aa |
child 19493 | ca76e77dd663 |
--- a/mercurial/commands.py Thu Jul 25 00:00:47 2013 -0500 +++ b/mercurial/commands.py Thu Jul 25 00:33:28 2013 -0500 @@ -5482,7 +5482,9 @@ t = ', '.join(t) cleanworkdir = False - if len(parents) > 1: + if repo.vfs.exists('updatestate'): + t += _(' (interrupted update)') + elif len(parents) > 1: t += _(' (merge)') elif branch != parents[0].branch(): t += _(' (new branch)')