Comment 1 for bug 1004004

AIUI it needs to check, for each revision passed in, whether it is currently in conflict, or part of the revision history, and resolve the first and ignore the second. I might have gotten that wrong.