~bzr-pqm/bzr/bzr.dev

Viewing all changes in revision 4955.3.2.

  • Committer: Vincent Ladeuil
  • Date: 2010-01-20 12:58:43 UTC
  • mto: (4972.1.1 integration)
  • mto: This revision was merged to the branch mainline in revision 4973.
  • Revision ID: v.ladeuil+lp@free.fr-20100120125843-87nbl3vih0zosuew
Tweak the spacing.

* bzrlib/builtins.py:
(cmd_merge): Use a separate paragraph for --uncommitted.

* NEWS: 
Fix entry order.

expand all expand all

Show diffs side-by-side

added added

removed removed

Lines of Context: