view tests/test-merge4.out @ 4436:a764edb6fc95

Add branch information to hg export.
author Eric Hopper <hopper@omnifarious.org>
date Thu, 10 May 2007 13:42:36 -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)