view tests/test-merge4.out @ 8254:f108e89400d8

churn: use .hgchurn in repo root as default map file
author Martin Geisler <mg@lazybytes.net>
date Wed, 29 Apr 2009 20:03:54 +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)