view tests/test-merge4.out @ 3373:7f486971d263

Add git-1.4 binary patch support
author Brendan Cully <brendan@kublai.com>
date Thu, 12 Oct 2006 09:17:16 -0700
parents b2ae81a7df29
children
line wrap: on
line source

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)