diff mercurial/templatefilters.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 e828975722c8
children cce404b0c918 829f2dd99f5c
line wrap: on
line diff