Improve edit stashing when vary-revision is used