Bug 892 re-enable pending mode and reconcile-finish

This should do it, and it should work across multiple files.