* DirCacheCheckout: don't use deprecated method * WorkingTreeModifiedEvent: must be fired explicitly after merge