tests/test-merge4.out
author Vadim Gelfer <vadim.gelfer@gmail.com>
Sun, 04 Jun 2006 16:47:46 -0700
changeset 2400 2e90024e1471
parent 2175 b2ae81a7df29
permissions -rw-r--r--
import: allow to import stdin with file name "-"

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)