Mercurial > hg
view tests/test-symlink-os-yes-fs-no.py.out @ 17394:19e4861f9730 stable
tests: merging bookmarked heads
45b5eb2941d0 fixed an error that occured when heads being merged were both
inactive bookmarks. Add a test for that case.
author | John Li <jli@circularly.org> |
---|---|
date | Mon, 27 Aug 2012 09:57:58 -0400 |
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