Mercurial > hg > mercurial-crew-with-dirclash

diff tests/test-merge2 @ 3233:3fd098e0902d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge: extend file merge function for renames
author Matt Mackall <mpm@selenic.com>
date Mon, 02 Oct 2006 12:04:48 -0500
parents 7544700fd931
children 9dcf9d45cab8
line wrap: on
line diff