Mercurial > hg > mercurial-crew-with-dirclash

diff hgmerge @ 4361:46280c004f22

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
change tests to use simplemerge by default
author Alexis S. L. Carvalho <alexis@cecm.usp.br>
date Mon, 16 Apr 2007 20:17:39 -0300
parents 6a03cff2b0f5
children e4480f2b61e9
line wrap: on
line diff