tests/test-merge2.out
author Matt Mackall <mpm@selenic.com>
Sun, 03 Dec 2006 16:16:33 -0600
changeset 3777 037824e6d362
parent 2175 b2ae81a7df29
permissions -rw-r--r--
tests: set a default encoding for running tests (ASCII)

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