view tests/test-merge4.out @ 3588:45574a225632

git patch: create empty added files
author Brendan Cully <brendan@kublai.com>
date Mon, 30 Oct 2006 16:10:58 -0800
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)