-
maruel@chromium.org authored
To reproduce, svn delete a file, then svn merge -c -N the file to revive it. Also fix a unit test that was broken for a while. TEST=none BUG=none Review URL: http://codereview.chromium.org/6576005 git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@75835 0039d316-1c4b-4281-b951-d872f2087c98
00fdcb33