I tried using mpatch with mq to do manual merging of patch conflicts. It seems to work very nicely (required a bit of windows related tweaks though) . I'd like to be able to find out afterwards which of the patched files required merging. Is this at all possible? Andrei