checkout,merge: loosen overwriting untracked file check based on info/exclude