Mercurial > hg
comparison mercurial/merge.py @ 15292:7fa471248185 stable
discovery: Fix error print mentioning a 'None' branch
When talking to old server discovery use heads of the 'None' branch to refer to
topological heads. This use of None should never make it to the end user.
| author | Pierre-Yves David <pierre-yves.david@logilab.fr> |
|---|---|
| date | Mon, 17 Oct 2011 11:37:59 +0200 |
| parents | 3afe5edda4e3 |
| children | b0a88bda3381 |
comparison
equal
deleted
inserted
replaced
| 15291:1fead3ad7874 | 15292:7fa471248185 |
|---|