Mercurial > hg > mercurial-crew-with-dirclash

diff tests/test-merge5 @ 3001:ad558f297eb1

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge: simplify some update logic
author Matt Mackall <mpm@selenic.com>
date Tue, 22 Aug 2006 16:47:27 -0500
parents 39eb64b23cb5
children 41989e55fa37
line wrap: on
line diff