Merge proposals dependent on lp:~dylanmccall/bzr/test_minimal_conflicts_with_offset

lp:~dylanmccall/bzr/test_minimal_conflicts_with_offset has no merge proposals.