view tests/test-default-push.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 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