Comment on p4merge

The only/best diff tool that handles non-English text well. The merge interface is a bit weird but workable, for simple diffs it's good.