Documentation is unclear about merge history preservation

[Kevin Smith]

My goal was to make changes on a feature branch, merge those changes into the mainline, and then be able to browse the mainline history and be able to see each individual commit. After reading the documentation, and looking at the log command, and doing some simple tests, it seemed to me that the merge into the mainline was combining all my commits into one big super-commit. It seemed like it was losing the individual commit history.

This is basically point 6 on this evaluation:
http://changelog.complete.org/posts/528-Whose-Distributed-VCS-Is-The-Most-Distributed.html

It seems quite possible that the author of that page had the same confusion I did, resulting in bzr getting a failing score on that issue.

In the documentation, the merge command should describe this. The diff -c documentation should be more clear about this case, with an example. And the workflow descriptions (including unbind/bind) should mention it as well.