# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: martin.hansson@oracle.com-20101007082444-\ # u7kv5fthpn66nw7q # target_branch: file:///data0/martin/bzr/bug56423/5.5bt-null_merge/ # testament_sha1: 5bb4f7f2057059310e7bf7fc32cf59a0fb5fc51a # timestamp: 2010-10-07 10:29:19 +0200 # source_branch: file:///data0/martin/bzr/bug56423/5.1bt/ # base_revision_id: alexander.nozdrin@oracle.com-20101006150613-\ # ls60rb2tq5dpyb5c # # Begin bundle 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