view tests/test-merge2.out @ 8026:683d8ebcf434

expand "dir" to "directory" in help texts
author Martin Geisler <mg@lazybytes.net>
date Tue, 07 Apr 2009 22:47:56 +0200
parents 4b0c9c674707
children
line wrap: on
line source

0 files updated, 0 files merged, 0 files removed, 0 files unresolved
created new head
0 files updated, 0 files merged, 0 files removed, 0 files unresolved
adding b
created new head
0 files updated, 0 files merged, 0 files removed, 0 files unresolved
adding b
created new head