# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: martin.hansson@oracle.com-20101007083311-\ # b6ef17iufdasn0lb # target_branch: file:///data0/martin/bzr/bug56423/t-m-null_merge/ # testament_sha1: 95a458a9eeea63bff058b8210e54379c23b868b1 # timestamp: 2010-10-07 10:34:30 +0200 # source_branch: file:///data0/martin/bzr/bug56423/5.5bt-null_merge/ # base_revision_id: tor.didriksen@oracle.com-20101007082538-\ # gva9ma5d1sqyhcjo # # Begin bundle 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 rVAa/DgwLxEIRoo889/i7kinChILp0YTgA==