comparison mercurial/url.py @ 20639:1df033640a8e

merge: handle acceptremove of create+delete early in manifest merge
author Mads Kiilerich <madski@unity3d.com>
date Fri, 28 Feb 2014 02:26:03 +0100
parents 7d589d923b8a
children a939eeb94833
comparison
equal deleted inserted replaced
20638:b228ad1f79d7 20639:1df033640a8e