Mercurial > hg > mercurial-crew-with-dirclash
view mercurial/node.py @ 3869:ad6f34c83c3d
Add instructions how to redo/finish failed merge with local working directory.
b2ae81a7df29 already implemented this for branch merges.
| author | Thomas Arendsen Hein <thomas@intevation.de> |
|---|---|
| date | Mon, 11 Dec 2006 18:09:52 +0100 |
| parents | 3b4e00cba57a |
| children | abaee83ce0a6 |
line wrap: on
line source
""" node.py - basic nodeid manipulation for mercurial Copyright 2005, 2006 Matt Mackall <mpm@selenic.com> This software may be used and distributed according to the terms of the GNU General Public License, incorporated herein by reference. """ from demandload import demandload demandload(globals(), "binascii") nullrev = -1 nullid = "\0" * 20 def hex(node): return binascii.hexlify(node) def bin(node): return binascii.unhexlify(node) def short(node): return hex(node[:6])