~abentley/bzrtools/bzrtools.dev

« back to all changes in this revision

Viewing changes to README

  • Committer: Aaron Bentley
  • Date: 2009-03-11 06:44:59 UTC
  • Revision ID: aaron@aaronbentley.com-20090311064459-mez7p4g64e2xz7x9
Implement conflict-diff

Show diffs side-by-side

added added

removed removed

Lines of Context:
24
24
oldtext=darkred
25
25
diffstuff=darkgreen
26
26
 
27
 
CLEAN-TREE
28
 
Delete unknown, ignored, or detritus files, leaving versioned files untouched.
29
 
 
30
27
FETCH-GHOSTS
31
28
Scan this branch for missing ancestors (aka "ghosts), and attempt to retrieve
32
29
them from a specified branch.