tests/test-merge2.out
author Jose M. Prieto <jmprieto@gmx.net>
Tue, 03 Oct 2006 12:33:14 +0200
changeset 3250 e96d2956eb4a
parent 2175 b2ae81a7df29
permissions -rw-r--r--
util.strdate: compute timestamp using UTC, not local timezone

0 files updated, 0 files merged, 0 files removed, 0 files unresolved
0 files updated, 0 files merged, 0 files removed, 0 files unresolved
adding b
0 files updated, 0 files merged, 0 files removed, 0 files unresolved
adding b