tests/test-merge4.out
author Vadim Gelfer <vadim.gelfer@gmail.com>
Wed, 21 Jun 2006 17:30:31 -0700
changeset 2480 519a1011db91
parent 2175 b2ae81a7df29
permissions -rw-r--r--
fix -I/-X when relative paths used or in subdir

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)