~bzr-pqm/bzr/bzr.dev

Viewing all changes in revision 6282.3.8.

  • Committer: Vincent Ladeuil
  • Date: 2011-11-29 07:46:55 UTC
  • mto: (6321.1.1 trunk)
  • mto: This revision was merged to the branch mainline in revision 6322.
  • Revision ID: v.ladeuil+lp@free.fr-20111129074655-u10pfmd09kgn7pa0
We don't need select_po_file, we directly use the contents provided by merge for {this} and {other}.

expand all expand all

Show diffs side-by-side

added added

removed removed

Lines of Context: