tests/test-merge4.out
author Brendan Cully <brendan@kublai.com>
Mon, 14 Aug 2006 22:48:03 -0700
changeset 2892 8b02af865990
parent 2175 b2ae81a7df29
permissions -rw-r--r--
Add diff --git option

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)