- 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 | ||
|---|---|---|---|---|---|---|---|
 ..
|
|||||||
__init__.py |
195 | 19 years ago | mbp at sourcefrog | - import lovely urlgrabber library | 2.2 KB |
|
|
|
byterange.py |
195 | 19 years ago | mbp at sourcefrog | - import lovely urlgrabber library | 16.4 KB |
|
|
|
grabber.py |
195 | 19 years ago | mbp at sourcefrog | - import lovely urlgrabber library | 43.5 KB |
|
|
|
keepalive.py |
539 | 19 years ago | Martin Pool | - urlgrabber fix for parsing python version string | 19.8 KB |
|
|
|
mirror.py |
195 | 19 years ago | mbp at sourcefrog | - import lovely urlgrabber library | 17.6 KB |
|
|
|
progress.py |
195 | 19 years ago | mbp at sourcefrog | - import lovely urlgrabber library | 17.6 KB |
|
|