Here I have been able to recreate the problem.
Changes will not be shown in the diff window before after they are commited, and subsequently the merge tool does not work either.