26 Jul
2008
26 Jul
'08
4:40 p.m.
Merging from an older version might not be a no-op, if you rolled back the change(s) in a later commit (for example by deleting the file). The question is related to brining back previously deleted files (in a new place; merging something into a new situation of course needs to take into acount that things may have been renamed), which was mentioned as a form of rename.