Disable diffs during file functional tests

No functional tests actually use the diff behavior and this speeds them
up quite a bit.
avoid clobbering original diff disable state when nested
forcibly turn diffing back on after diff tests