Mercurial > hg > mercurial-crew-with-dirclash
comparison tests/test-pull.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 | 4e35843b2683 |
children | 9d1c3529ebbc |
comparison
equal
deleted
inserted
replaced
2826:3aeab7bb5adc | 2827:56f99f5aab34 |
---|