Mercurial > hg
changeset 16206:1970e6f61009
merge with stable
mercurial/filemerge.py in the default branch does not need the additional
unlink calls, because the unlink calls at the end of filemerge.filemerge()
are called for internal:dump, too.
| author | Thomas Arendsen Hein <thomas@intevation.de> |
|---|---|
| date | Thu, 01 Mar 2012 17:45:13 +0100 |
| parents | 0196c437ca9f (current diff) b605448eb254 (diff) |
| children | 85db991780b7 |
| files | mercurial/filemerge.py |
| diffstat | 0 files changed, 0 insertions(+), 0 deletions(-) [+] |