diff mercurial/fileset.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 9e02e032b522
children 5d9e2031c0b1
line wrap: on
line diff