view tests/test-symlink-os-yes-fs-no.py.out @ 20637:73a3a2386654

tests: add systematic test of merge ancestor calculation There is probably some overlap with the existing tests - it is hard to figure out what these tests are doing.
author Mads Kiilerich <madski@unity3d.com>
date Tue, 25 Feb 2014 20:28:40 +0100
parents ca6cebd8734e
children eb586ed5d8ce
line wrap: on
line source

requesting all changes
adding changesets
adding manifests
adding file changes
added 1 changesets with 4 changes to 4 files
updating to branch default
4 files updated, 0 files merged, 0 files removed, 0 files unresolved
requesting all changes
adding changesets
adding manifests
adding file changes
added 1 changesets with 4 changes to 4 files
updating to branch default
4 files updated, 0 files merged, 0 files removed, 0 files unresolved