Aaron Bentley пишет: > This patch disables diff3 on win32, because typical diff3 > implementations on win32 do not properly preserve line endings. > > The lack of diff3 isn't very significant, because we still provide our > default native python implementation Merge3, as well as knit/weave merging. +1. (We were discussed this via IRC). -- Alexander