- Committer: Martin Pool
- Date: 2005-06-06 04:17:53 UTC
- Revision ID: mbp@sourcefrog.net-20050606041753-abe590daf0d7f959
Updated merge patch from Aaron
This patch contains all the changes to merge that I'd like to get into
0.5, namely
* common ancestor BASE selection
* merge reports conflicts when they are encountered
* merge refuses to operate in working trees with changes
* introduces revert command to revert the working tree to the
last-committed state
* Adds some reasonable help text
This patch contains all the changes to merge that I'd like to get into
0.5, namely
* common ancestor BASE selection
* merge reports conflicts when they are encountered
* merge refuses to operate in working trees with changes
* introduces revert command to revert the working tree to the
last-committed state
* Adds some reasonable help text
| Filename | Latest Rev | Last Changed | Committer | Comment | Size | ||
|---|---|---|---|---|---|---|---|
 ..
|
|||||||
bash
|
331 | 19 years ago | Martin Pool | - sketchy experiments in bash and zsh completion |
|
||
|
zsh
|
331 | 19 years ago | Martin Pool | - sketchy experiments in bash and zsh completion |
|
||
add-bzr-to-baz |
347 | 19 years ago | Martin Pool | - add-bzr-to-baz utility script | 181 bytes |
|
|
|
create_bzr_rollup.py |
621 | 19 years ago | Martin Pool | - script to create rollups, from John | 5.3 KB |
|
|
|
fortune |
423 | 19 years ago | Martin Pool | - Add fortune-cookie external plugin demonstration | 306 bytes |
|
|
|
upload-bzr.dev |
590 | 19 years ago | Martin Pool | - rsync upload should be quieter | 735 bytes |
|
|