← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to doc/quilt.txt

  • 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

Show diffs side-by-side

added added

removed removed

Lines of Context:
doc/quilt.txt
 
1
Quilt
 
2
=====
 
3
 
 
4
Descendent of Andrew Morton's patch scripts.
 
5
 
 
6
Demonstrates that quite a powerful tool can be built in a relatively
 
7
short time.
 
8
 
 
9
Is largely not concerned with preserving a history record.  Allows 
 
10
 
 
11
Pop patches off, similar to excluding them.
 
 
b'\\ No newline at end of file'