Fix the "revert" command so that it distinguishes between files that were
added versus files imported by merge.  Added files are not unlinked.
Ticket [baf9b6b11e08c1].