Greg Troxel writes: > If you "rm foo/local", that's like cfs discardlocal.
I understand that you could define the semantics of `rm' that way solely for the purpose of conflict resolution. I'm afraid that people who have a different end result in mind would be likely to find that disconcerting. I also think that many would then expect the kind of facility I described as merge-like, and start editing the file. I suspect that's OK, but the whole thing makes me nervous.
