Mercurial > hg > mercurial-crew-with-dirclash
view tests/test-default-push.out @ 3506:9de0e64545a3
Test that we notice the empty files from the second parent during a merge
This didn't work with 0.9.1, but was fixed by 05257fd28591.
author | Alexis S. L. Carvalho <alexis@cecm.usp.br> |
---|---|
date | Wed, 25 Oct 2006 02:51:27 -0300 |
parents | 6dbb8ae0a0b3 |
children |
line wrap: on
line source
adding a 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 1 files updated, 0 files merged, 0 files removed, 0 files unresolved % push should push to default when default-push not set pushing searching for changes adding changesets adding manifests adding file changes added 1 changesets with 1 changes to 1 files % push should push to default-push when set pushing searching for changes adding changesets adding manifests adding file changes added 1 changesets with 1 changes to 1 files