view tests/test-merge4.out @ 10225:6521605bc200 stable

relink: ensure consistent candidate order
author Martin Geisler <mg@lazybytes.net>
date Sat, 09 Jan 2010 23:16:36 +0100
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)