view tests/test-merge4.out @ 11856:db969ebdebd9

tests: unify test-backout
author Martin Geisler <mg@lazybytes.net>
date Sat, 14 Aug 2010 02:28:53 +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)