~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to doc/darcs.txt

  • Committer: Martin Pool
  • Date: 2005-07-05 07:19:12 UTC
  • Revision ID: mbp@sourcefrog.net-20050705071911-6a116ea7c5379658
- Renamed merge3 test suite for easier access.

- New merge approach based on finding triple-matching regions, and comparing
  the regions between them; add find_sync_regions() and some tests for it.

Show diffs side-by-side

added added

removed removed

Lines of Context:
69
69
the tree as it will be committed (taking account of partial commits),
70
70
not the working tree.
71
71
 
 
72
 
 
73
Schwern
 
74
-------
 
75
 
 
76
* http://www.scannedinavian.org/DarcsWiki/SchwernLikesDarcs
 
77
* http://www.scannedinavian.org/DarcsWiki/SchwernHatesDarcs
 
78
 
 
79
I think we hit most of these; more evidence for the hypothesis that
 
80
what people really like about darcs is the simple interface not the
 
81
patch-commutation model.
 
 
b'\\ No newline at end of file'