Mercurial > hg > mercurial-crew-with-dirclash
diff tests/test-conflict.out @ 2827:56f99f5aab34
Merge: refactor err and failedmerge -> unresolved
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Tue, 08 Aug 2006 09:26:00 -0500 |
parents | b2ae81a7df29 |
children | 46280c004f22 |