Merge isn't retried if disk s full during merging.
Authored by: dholmes999 2009-05-23
Parent: [r307]
Child: [r309]