Mercurial > hg > mercurial-crew-with-dirclash
diff doc/hgmerge.1.txt @ 3675:6990e499d71a
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 |