Mercurial > hg > mercurial-crew-with-dirclash
comparison hgext/acl.py @ 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 | 7b1fce1d5e71 |
children | 1b5b98837bb5 |
comparison
equal
deleted
inserted
replaced
4357:99c853a1408c | 4358:465b9ea02868 |
---|