diff mercurial/mdiff.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 1e5b38a919dd
children 3fbef7ac26f0
line wrap: on
line diff