comparison tests/test-rebase-bookmarks.t @ 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 f2a0a0e76b4c
children 19d6fec60b81
comparison
equal deleted inserted replaced
20638:b228ad1f79d7 20639:1df033640a8e