tree 28e7cdfa16689c63a221bfbb3514fb63bb606ad6
parent 59baf9148e4b16028203d9e881136ab4c005202c
author Robin Rosenberg <robin.rosenberg@dewire.com> 1365451506 +0200
committer Robin Rosenberg <robin.rosenberg@dewire.com> 1365453819 +0200

A deleted work tree file is not a conflict when merge wants to delete it

Bug: 405199
Change-Id: I4b2ef3dc432d2fad8a6fabd1c8aec407b5c8c5ac
Signed-off-by: Robin Rosenberg <robin.rosenberg@dewire.com>