Mercurial > hg > mercurial-crew-with-dirclash

comparison tests/test-merge6.out @ 2827:56f99f5aab34

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge: refactor err and failedmerge -> unresolved
author Matt Mackall <mpm@selenic.com>
date Tue, 08 Aug 2006 09:26:00 -0500
parents b2ae81a7df29
children 8feb33c2d153
comparison
equal deleted inserted replaced
2826:3aeab7bb5adc 2827:56f99f5aab34