tests/test-merge2.out
author Bryan O'Sullivan <bos@serpentine.com>
Fri, 05 Oct 2007 12:42:52 -0700
changeset 5388 557e4a916e12
parent 2175 b2ae81a7df29
permissions -rw-r--r--
run-tests.py: allow a different temporary directory to be specified

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