/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

  • Committer: Robert Collins
  • Date: 2010-04-14 04:48:00 UTC
  • Revision ID: robertc@robertcollins.net-20100414044800-wda5phry84h497pn
``bzr update`` when a pending merge in the working tree has been merged
into the master branch will no longer claim that old commits have become
pending merges. (Robert Collins, #562079)
Filename Latest Rev Last Changed Committer Comment Size
..
tests 4869.3.34 15 years ago Vincent Ladeuil Finish the patch based on reviews. * bzrlib/tests Diff
__init__.py 4797.5.1 15 years ago Robert Collins Support state on per-file merging to permit more e 2 KB Diff Download File
news_merge.py 4797.5.3 15 years ago Robert Collins Tweak ConfigurableFileMerger to use class variable 3.6 KB Diff Download File
parser.py 4869.3.27 15 years ago Andrew Bennetts Move news_merge plugin from contrib to bzrlib/plug 2.1 KB Diff Download File
README 4869.3.34 15 years ago Vincent Ladeuil Finish the patch based on reviews. * bzrlib/tests 310 bytes Diff Download File