← Back to branch summary

~abentley/bzrtools/bzrtools.dev

« back to all changes in this revision

Viewing changes to README

  • Committer: Aaron Bentley
  • Date: 2006-03-24 13:13:01 UTC
  • Revision ID: aaron.bentley@utoronto.ca-20060324131301-6a6d76314c9e9b98
Removed docs for resolve and conflicts, now that they're in the mainline

Show diffs side-by-side

added added

removed removed

Lines of Context:
README
50
50
Delete unknown (or, optionally, ignored) files, leaving versioned files
51
51
untouched.
52
52
 
53
 
CONFLICTS
54
 
List files in the tree that have conflicts.
55
 
 
56
 
RESOLVE
57
 
Mark conflicts as resolved, by deleting TREE, BASE and OTHER files.
58
 
 
59
53
BRANCH-HISTORY
60
54
Show a history of the branch, separated by committer and branch nick.
61
55