view tests/test-merge4.out @ 7049:6489ee64b522

fetch: use dirstate branch instead of first parents
author Sune Foldager <cryo@cyanite.org>
date Wed, 24 Sep 2008 13:22:11 +0200
parents 4b0c9c674707
children
line wrap: on
line source

0 files updated, 0 files merged, 1 files removed, 0 files unresolved
created new head
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit)