~bzr-pqm/bzr/bzr.dev

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2011-07-07 10:56:19 UTC
  • mfrom: (6011.2.1 trunk)
  • Revision ID: pqm@pqm.ubuntu.com-20110707105619-6tftefqyt2zlmho5
(vila) Merging unrelated trees prefers THIS root (Aaron Bentley)
Filename Latest Rev Last Changed Committer Comment Size
..
__init__.py 4869.3.34 14 years ago Vincent Ladeuil Finish the patch based on reviews. * bzrlib/tests 995 bytes Diff Download File
test_news_merge.py 4988.1.1 14 years ago John Arbash Meinel Merge the per-file-hook updates. 1 KB Diff Download File