view tests/test-merge4.out @ 11866:c4e2eb4871d7

tests: unify test-dirstate-future
author Adrian Buehlmann <adrian@cadifra.com>
date Thu, 12 Aug 2010 20:25:37 +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)