Mercurial > hg > mercurial-crew-with-dirclash
view tests/test-lock-badness.out @ 4358:465b9ea02868
Import 3-way merge code from bzr
merge3.py is imported as contrib/simplemerge
test_merge3.py is imported as tests/test-simplemerge.py
author | Alexis S. L. Carvalho <alexis@cecm.usp.br> |
---|---|
date | Mon, 16 Apr 2007 20:17:39 -0300 |
parents | b2ae81a7df29 |
children |
line wrap: on
line source
adding a 1 files updated, 0 files merged, 0 files removed, 0 files unresolved adding b pushing to ../a abort: could not lock repository ../a: Permission denied