Mercurial > hg > mercurial-crew-with-dirclash

comparison doc/hgmerge.1.txt @ 3675:6990e499d71a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Revert almost all of 5be434785317; add a test Because of file copies, we should update the manifest dict only after committing all files.
author Alexis S. L. Carvalho <alexis@cecm.usp.br>
date Sat, 18 Nov 2006 19:44:42 -0200
parents 345bac2bc4ec
children 63b9d2deed48
comparison
equal deleted inserted replaced
3674:9103dab96093 3675:6990e499d71a