Mercurial > hg > mercurial-crew-with-dirclash

diff tests/test-merge7.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 e506c14382fd
children 49988d9f0758
line wrap: on
line diff