On Thu, 2013-12-05 at 18:13 +0300, anatoly techtonik wrote:
> The biggest confusion comes from cryptic merge conflicts in files that may
> not have been modified.
This appears to be a bug, not a documentation problem:
http://bz.selenic.com/show_bug.cgi?id=4076
A workaround is to do incremental rebases.
- Jordi G. H.