view tests/test-merge4.out @ 8633:c31fe74a6633

store encoding: .i/.d encoding for non-store repo (broken by 810387f59696)
author Benoit Boissinot <benoit.boissinot@ens-lyon.org>
date Tue, 26 May 2009 23:49:53 +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)