← Back to branch summary

~bzr-pqm/bzr/bzr.dev

Viewing all changes in revision 5430.7.1.

  • Committer: Rory Yorke
  • Date: 2010-09-24 16:16:13 UTC
  • mto: This revision was merged to the branch mainline in revision 5455.
  • Revision ID: rory.yorke@gmail.com-20100924161613-269xiflsrhqrhydh
Added --show-base to pull and update (bug 202374).

Behaviour copied from merge.  Tests in
tests/blackbox/test_{pull,update}.py

expand all expand all

Show diffs side-by-side

added added

removed removed

Lines of Context: