Mercurial > hg-stable
diff mercurial/filelog.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 | 3bda242bf244 |
children | 4669e26747c3 |