Mercurial > hg > mercurial-crew-with-dirclash

view tests/test-merge5.out @ 5190:da1658d63647

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Move enabling of demandimport to dispatch.py This avoids loading many modules before enabling demandimport.
author Alexis S. L. Carvalho <alexis@cecm.usp.br>
date Fri, 17 Aug 2007 17:33:27 -0300
parents fffc8a733bf9
children
line wrap: on
line source

1 files updated, 0 files merged, 0 files removed, 0 files unresolved
removing b
abort: update spans branches, use 'hg merge' or 'hg update -C' to lose changes