- 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 | ||
|---|---|---|---|---|---|---|---|
 ..
|
|||||||
new-inventory-sample.xml |
149 | 19 years ago | mbp at sourcefrog | experiment with new nested inventory file format n | 19.8 KB |
|
|
|
performance.txt |
149 | 19 years ago | mbp at sourcefrog | experiment with new nested inventory file format n | 9.2 KB |
|
|