/brz/remove-bazaar

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

  • Committer: Andrew Bennetts
  • Date: 2010-04-22 07:35:06 UTC
  • Revision ID: andrew.bennetts@canonical.com-20100422073506-7i5pqyhzdj5pcelx
Create a PerFileMerger helper class that is midway between AbstractPerFileMerger and ConfigurableFileMerger.  It allows the example merge plugin in the docs (the always conflict *.xml files) to be much, much simpler.
Filename Latest Rev Last Changed Committer Comment Size
..
index.txt 4853.1.1 16 years ago Patrick Regan Removed trailing whitespace from files in doc dire 8.8 KB Diff Download File