Comment 1 for bug 697810

To give a specific example:

mkdir foo
cd foo
bzr init
echo foo > a
bzr add a
bzr commit -m "added a"
bzr branch . ../bar
cd ../bar
echo bar > b
bzr add b
bzr commit -m "added b"
cd ../foo
bzr merge ../bar
bzr commit -m "merged bar"
bzr log -p

The log output shows a diff for rev 2 adding "bar" to file b. Doing the same thing with git shows no changes done by the merge commit, since it was the parent commit that added the file b, not the merge commit. In effect, you see the change in both the original commit and the merge commit with bzr ( rev 2 and 1.1.1 ), but only in the original commit with git. It is confusing to see the same diff duplicated in two revisions, and makes reviewing the merge difficult or impossible.