Interesting. Diff3 does try and pick the best but only based on the order the files are specified. It trys to prefer the newest change rather than voting. I guess it depends on what you think is most important.
Glad you got something you like and works for you. Thanks for posting. Others may find it useful.
Dale
|