diff mercurial/posix.py @ 16792:ad394c897b16

merge: do not warn about copy and rename in the same transaction (issue2113)
author Thomas Arendsen Hein <thomas@intevation.de>
date Wed, 23 May 2012 17:25:48 +0200
parents 7002bb17cc5e
children 0cb55b5c19a3
line wrap: on
line diff