Comment 1 for bug 207512

The uncommitted changes should affect the diff, as they are taken into account for the merge.

You should be able to work around this with --force, but I agree it should not be required.