view tests/test-merge4.out @ 8380:a00a4db76a15

context: replace pseudo-set by real set
author Simon Heimberg <simohe@besonet.ch>
date Thu, 14 May 2009 10:59:55 +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)