tests/test-merge4.out
author Vadim Gelfer <vadim.gelfer@gmail.com>
Sun, 13 Aug 2006 15:24:30 -0700
changeset 2881 eab07a7b7491
parent 2175 b2ae81a7df29
child 6336 4b0c9c674707
permissions -rw-r--r--
fix patch.patch.filterfiles. now test-diff-subdir passes.

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)