view tests/test-symlink-os-yes-fs-no.py.out @ 20792:89059c450c56

merge: mark mergestate as dirty when resolve changes _state Correctness - no visible difference so far.
author Mads Kiilerich <madski@unity3d.com>
date Fri, 28 Feb 2014 02:26:03 +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