Mercurial > hg
comparison setup.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 | d5abe76da61e |
children | f9da84a950d0 |
comparison
equal
deleted
inserted
replaced
15500:d5abe76da61e | 15501:2371f4aea665 |
---|