- Committer: Aaron Bentley
- Date: 2005-07-15 13:13:40 UTC
- Revision ID: abentley@panoramicfeedback.com-20050715131340-c2ff3983303bf438
Fixed conflict handling for missing merge targets
| Filename | Latest Rev | Last Changed | Committer | Comment | Size | ||
|---|---|---|---|---|---|---|---|
 .. |
|||||||
bzrlib
|
1 | 19 years ago | mbp at sourcefrog | import from baz patch-364 |
|
||
|
contrib
|
331 | 19 years ago | Martin Pool | - sketchy experiments in bash and zsh completion |
|
||
|
doc
|
6 | 19 years ago | mbp at sourcefrog | import all docs from arch |
|
||
|
effbot
|
791 | 19 years ago | Martin Pool | - import effbot.org http client |
|
||
|
elementtree
|
72 | 19 years ago | mbp at sourcefrog | - import a subset of elementtree for easier instal |
|
||
|
notes
|
10 | 19 years ago | mbp at sourcefrog | import more files from baz |
|
||
|
patches
|
520 | 19 years ago | Martin Pool | - add space for un-merged patches |
|
||
|
plugins
|
761 | 19 years ago | Martin Pool | - move standard plugins from contrib/plugins to ju |
|
||
|
tools
|
854 | 19 years ago | Martin Pool | - rearrange and clear up merged weave |
|
||
|
urlgrabber
|
195 | 19 years ago | mbp at sourcefrog | - import lovely urlgrabber library |
|
||
.bzrignore |
895 | 19 years ago | Martin Pool | - ignore tmp dir | 145 bytes |
|
|
|
.rsyncexclude |
363 | 19 years ago | Martin Pool | - do upload CHANGELOG to web server, even though i | 152 bytes |
|
|
|
build-api |
496 | 19 years ago | Martin Pool | - patch from ddaa to create api/ directory befo | 88 bytes |
|
|
|
bzr |
443 | 19 years ago | Martin Pool | - Patch from Fredrik Lundh to check Python version | 1.5 KB |
|
|
|
bzr-man.py |
635 | 19 years ago | Martin Pool | - manpage generator by Hans Ulrich Niedermann | 7.4 KB |
|
|
|
NEWS |
900 | 19 years ago | Martin Pool | - patch from john to search for matching commits | 9.2 KB |
|
|
|
README |
449 | 19 years ago | Martin Pool | - Notes on library dependencies | 1.3 KB |
|
|
|
setup.py |
45 | 19 years ago | Martin Pool | - add setup.py and install instructions - rename m | 472 bytes |
|
|
|
testbzr |
736 | 19 years ago | Martin Pool | - move old blackbox code from testbzr into bzrlib. | 845 bytes |
|
|
|
testsweet.py |
842 | 19 years ago | Martin Pool | - don't say runit when running tests under python2 | 9.3 KB |
|
|
|
TODO |
903 | 19 years ago | Martin Pool | todo | 13.2 KB |
|
|