comparison mercurial/localrepo.py @ 20615:b96cb15ec9e0 stable 2.9.1

merge: audit the right destination file when merging with dir rename
author Mads Kiilerich <madski@unity3d.com>
date Sat, 01 Mar 2014 18:09:39 +0100
parents a959f7167077
children 8567b4ea76ac f042d4b263f4
comparison
equal deleted inserted replaced
20594:ba619c50a355 20615:b96cb15ec9e0