view tests/test-merge4.out @ 8827:34d611dbed56

patchbomb: update test output to match 2aff285b902f
author Martin Geisler <mg@lazybytes.net>
date Thu, 18 Jun 2009 15:04:20 +0200
parents 4b0c9c674707
children
line wrap: on
line source

0 files updated, 0 files merged, 1 files removed, 0 files unresolved
created new head
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit)