diff tests/test-revlog-ancestry.py.out @ 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 f88c60e740a1
children b6db2e80a9ce
line wrap: on
line diff