~bzr-pqm/bzr/bzr.dev

Viewing all changes in revision 4978.1.1.

  • Committer: Vincent Ladeuil
  • Date: 2010-01-21 09:13:03 UTC
  • mfrom: (4971.3.3 fix-481526)
  • mto: This revision was merged to the branch mainline in revision 4980.
  • Revision ID: v.ladeuil+lp@free.fr-20100121091303-pp8rh4xgblyzo734
Add documentation for multi-parent merges

expand all expand all

Show diffs side-by-side

added added

removed removed

Lines of Context: