view tests/test-merge4.out @ 5942:b75105de8573

glog shows at most one file: correct synopsis
author Thomas Arendsen Hein <thomas@intevation.de>
date Sat, 26 Jan 2008 00:14:20 +0100
parents b2ae81a7df29
children 4b0c9c674707
line wrap: on
line source

0 files updated, 0 files merged, 1 files removed, 0 files unresolved
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit)