view tests/test-merge4.out @ 6359:25e74cd3f023

test-notify: make it pass on Mac OS X 10.5
author Florent Guillaume <fg@nuxeo.com>
date Sun, 23 Mar 2008 01:23:03 +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)