diff mercurial/simplemerge.py @ 21971:412ac613fd89 stable

status: explicitly exclude removed file from unknown and ignored Changeset 64fe488b5179 introduced a test to validate that file were not reported twice when both unknown and removed. This behavior change was introduced by 65cdc6bab91e alongside a bug that dropped ignored and unknown completely (issue4321). As we are going to fix the bug, we need a proper implementation of the behavior tested in 64fe488b5179.
author Pierre-Yves David <pierre-yves.david@fb.com>
date Fri, 01 Aug 2014 13:13:24 -0700
parents 4aeb7a6029ba
children f18830651811
line wrap: on
line diff