view tests/test-merge4.out @ 11055:a869a6a42c9e

test-acl: grep for $HGTMP, not /tmp/
author Martin Geisler <mg@lazybytes.net>
date Sat, 01 May 2010 16:35:27 +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)