~vila/bzr/conflict-manager

Merge more-auto-resolvable-conflicts into next
Filename Latest Rev Last Changed Committer Comment Size
..
apport 4597.737.16 14 years ago Robert Collins Update bugfix for 528114 to trunk. Diff
bzrlib 1185.1.29 18 years ago Robert Collins merge merge tweaks from aaron, which includes late Diff
contrib 1185.1.29 18 years ago Robert Collins merge merge tweaks from aaron, which includes late Diff
doc 1185.1.29 18 years ago Robert Collins merge merge tweaks from aaron, which includes late Diff
man1 2425.1.1 17 years ago Robert Collins ``make docs`` now creates a man page at ``man1/bzr Diff
tools 1185.1.29 18 years ago Robert Collins merge merge tweaks from aaron, which includes late Diff
.bzrignore 4597.805.5 14 years ago Martin Pool ignore .testrepository 1.2 KB Diff Download File
.rsyncexclude 1185.33.36 18 years ago Martin Pool Exclude more files from dumb-rsync upload 203 bytes Diff Download File
.testr.conf 4597.697.1 14 years ago Robert Collins * bzr now has a ``.testr.conf`` file in its source 93 bytes Diff Download File
BRANCH.TODO 4597.1136.6 13 years ago Marius Kruger * Update documentation * add NEWS 150 bytes Diff Download File
File bzr 4597.1051.1 13 years ago John Arbash Meinel Bump trunk to 2.3-dev1 5.2 KB Diff Download File
bzr.ico 3688.3.3 15 years ago John Arbash Meinel An updated transparent icon for bzr. 12.7 KB Diff Download File
COPYING.txt 1861.2.9 17 years ago Alexander Belchenko rename gpl.txt => COPYING.txt 17.5 KB Diff Download File
INSTALL 4597.978.5 14 years ago Martin Pool Correct more sloppy use of the term 'Linux' 1.4 KB Diff Download File
Makefile 4597.1163.5 13 years ago John Arbash Meinel Remove the 'false' invocation. 14.7 KB Diff Download File
MANIFEST.in 4597.554.2 14 years ago John Arbash Meinel Update the MANIFEST.in file. 118 bytes Diff Download File
NEWS 4620.1.11 13 years ago Vincent Ladeuil Merge more-tests into more-auto-resolvable-conflic 491 KB Diff Download File
NEWS-template.txt 4597.707.1 14 years ago Ian Clatworthy NEWS section template into a separate file 277 bytes Diff Download File
profile_imports.py 4597.1.430 14 years ago Canonical.com Patch Queue Manager (mbp) add import-tariff tests 6.1 KB Diff Download File
README 4597.600.3 14 years ago Martin Pool Correction to url from review: https://code.edge. 2.2 KB Diff Download File
README_BDIST_RPM 4597.554.1 14 years ago Joe Julian Added MANIFEST.in to allow bdist_rpm to have all t 397 bytes Diff Download File
File setup.py 4597.1106.8 13 years ago Gary van der Merwe Merge lp:bzr/2.2. 28.8 KB Diff Download File
TODO 4597.836.5 14 years ago Danny van Heumen Reverted now-useless TODO list. 115 bytes Diff Download File