Tfs tries to merge wrong changeset

Question

I have 2 changesets in the same file as below.

When I select the last changeset only which is 41183 and try to merge between branches, conflict occurs. However, it fetches changeset 41182 instead of 41183. The result should be 2 instead of 1. Why does TFS merge gets the previous changeset?

Enviroment: Visual Studio 2017, Tfs 2017/

Answer 1

似乎tfs的默认合并工具是错误的。当我使用不同的合并/比较工具（KDiff3）测试相同的情况时，会产生真实的输出。