Mercurial > hg > mercurial-crew-with-dirclash
comparison mercurial/keepalive.py @ 2827:56f99f5aab34
Merge: refactor err and failedmerge -> unresolved
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Tue, 08 Aug 2006 09:26:00 -0500 |
parents | c4325f0a9b91 |
children | 8520a773a141 |
comparison
equal
deleted
inserted
replaced
2826:3aeab7bb5adc | 2827:56f99f5aab34 |
---|