Mercurial > hg > mercurial-crew-with-dirclash

diff tests/test-merge-default @ 3096:54d85098fb82

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge: make unresolved a counter
author Matt Mackall <mpm@selenic.com>
date Tue, 22 Aug 2006 19:39:54 -0500
parents 013921c753bd
children 9cd6578750b9
line wrap: on
line diff