Mercurial > hg
diff mercurial/simplemerge.py @ 17297:6955d69a52a4 stable
obsolete: warns if markers exist in a repo where the feature is not enabled
We don't simply abort to allow the user to run other diagnostic commands.
author | Pierre-Yves David <pierre-yves.david@logilab.fr> |
---|---|
date | Sat, 28 Jul 2012 13:05:25 +0200 |
parents | e34106fa0dc3 |
children | 4aeb7a6029ba |