Mercurial > hg > mercurial-crew-with-dirclash
view tests/test-commit-copy.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 | 6990e499d71a |
children |
line wrap: on
line source
foo renamed from bar:26d3ca0dfd18e44d796b564e38dd173c9668d3a9 rev offset length base linkrev nodeid p1 p2 0 0 6 0 0 26d3ca0dfd18 000000000000 000000000000 1 6 7 1 1 d267bddd54f7 26d3ca0dfd18 000000000000