Mercurial > hg > mercurial-crew-with-dirclash
diff mercurial/dirstate.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 | 82864a2eb709 |
children | e78cad1f6b1f |