To get this branch, use:
bzr branch
http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar
- Committer: Aaron Bentley
- Date: 2007-07-06 17:21:34 UTC
- mto: (2590.2.12 changes-merge)
- Revision ID: abentley@panoramicfeedback.com-20070706172134-kz3k30d2pu61qngi
Restore conflict handling changes
| Filename | Latest Rev | Last Changed | Committer | Comment | Size | ||
|---|---|---|---|---|---|---|---|
 .. |
|||||||
bzrlib
|
1185.1.29 | 20 years ago | Robert Collins | merge merge tweaks from aaron, which includes late |
|
||
|
contrib
|
1185.1.29 | 20 years ago | Robert Collins | merge merge tweaks from aaron, which includes late |
|
||
|
doc
|
1185.1.29 | 20 years ago | Robert Collins | merge merge tweaks from aaron, which includes late |
|
||
|
man1
|
2425.1.1 | 18 years ago | Robert Collins | ``make docs`` now creates a man page at ``man1/bzr |
|
||
|
tools
|
1185.1.29 | 20 years ago | Robert Collins | merge merge tweaks from aaron, which includes late |
|
||
.bzrignore |
2399.1.17 | 18 years ago | John Arbash Meinel | [merge] bzr.dev 2562 | 590 bytes |
|
|
|
.rsyncexclude |
1185.33.36 | 19 years ago | Martin Pool | Exclude more files from dumb-rsync upload | 203 bytes |
|
|
|
BRANCH.TODO |
2399.1.16 | 18 years ago | John Arbash Meinel | [merge] bzr.dev 2466 | 150 bytes |
|
|
bzr |
2485.6.8 | 18 years ago | Martin Pool | Merge trunk | 4 KB |
|
|
|
bzr.ico |
1861.2.16 | 19 years ago | Alexander Belchenko | new official bzr.ico | 7.2 KB |
|
|
|
COPYING.txt |
1861.2.9 | 19 years ago | Alexander Belchenko | rename gpl.txt => COPYING.txt | 17.5 KB |
|
|
|
generate_docs.py |
1861.2.7 | 19 years ago | Alexander Belchenko | merge bzr.dev | 2.9 KB |
|
|
|
INSTALL |
2382.2.6 | 18 years ago | Martin Pool | Recommendation to delete bzrlib when installing | 675 bytes |
|
|
|
Makefile |
2571.3.2 | 18 years ago | Alexander Belchenko | Build pyrex/C extensions for bzr.exe | 5.6 KB |
|
|
|
NEWS |
2590.2.7 | 18 years ago | Aaron Bentley | Misc cleanup | 134 KB |
|
|
|
profile_imports.py |
1996.3.36 | 19 years ago | John Arbash Meinel | [merge] bzr.dev 2070 | 5.4 KB |
|
|
|
README |
2545.1.1 | 18 years ago | Martin Pool | Fix typo and remove version number from README | 2.4 KB |
|
|
|
setup.py |
2571.3.2 | 18 years ago | Alexander Belchenko | Build pyrex/C extensions for bzr.exe | 8.1 KB |
|
|
|
TODO |
2382.2.5 | 18 years ago | Martin Pool | Contents of TODO file moved into bug tracker | 115 bytes |
|
|