test for bzr merge
authorgian <gian@li82-39>
Wed, 21 Oct 2009 12:51:06 +0000 (14:51 +0200)
committergian <gian@li82-39>
Wed, 21 Oct 2009 12:51:06 +0000 (14:51 +0200)
commit2e235351d68715d0b232d48c21974ef6a89bb685
treec80ae73263199f46daf6d4fda5b8e8c451fbda1a
parent85ab0b48299435a5ecfa6f93af95948d432e096a
parentc80312557917015fcda9f7baa9e1acdce8ad9de7
test for bzr merge