Mercurial > hg > mercurial-crew-with-dirclash

diff tests/test-merge1 @ 4058:e7282dede8cd

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
filecommit: don't forget the local parent on a merge with a local rename
author Alexis S. L. Carvalho <alexis@cecm.usp.br>
date Tue, 30 Jan 2007 19:09:08 -0200
parents 9dcf9d45cab8
children ccfe423d3d0a
line wrap: on
line diff