changes remerged after lost in disk crash -- recovered from snapshot, partially recovered working tree, etc