Mercurial > hg
diff hgext/progress.py @ 15501:2371f4aea665
merge: give a special message for internal:merge failure (issue3105)
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Wed, 16 Nov 2011 18:04:19 -0600 |
parents | 5d261fd00446 |
children | 06671371e634 |