Merge proposals dependent on lp:~gz/bzr/resolve_file_not_done

lp:~gz/bzr/resolve_file_not_done has no merge proposals.