Patches have been the crucial component of many source control systems, including CVS.
When more advanced diffs are used, patches can be applied even to files that have been modified in the meantime, as long as those modifications do not interfere with the patch.