Mercurial > public > mercurial-scm > hg
comparison mercurial/keepalive.py @ 2921:addb58e3b41c
redo merge with mpm.
previous merge at ef8ee4477019 was bad.
| author | Vadim Gelfer <vadim.gelfer@gmail.com> |
|---|---|
| date | Wed, 16 Aug 2006 10:52:19 -0700 |
| parents | c4325f0a9b91 |
| children | 8520a773a141 |
comparison
equal
deleted
inserted
replaced
| 2919:b70740aefa4d | 2921:addb58e3b41c |
|---|