~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/plugins/po_merge/tests/test_po_merge.py

Merge hpss-no-vfs branch.

Show diffs side-by-side

added added

removed removed

Lines of Context:
1
 
# -*- coding: utf8
 
1
# -*- coding: utf-8
2
2
# Copyright (C) 2011 by Canonical Ltd
3
3
#
4
4
# This program is free software; you can redistribute it and/or modify