← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to NEWS

  • Committer: Aaron Bentley
  • Date: 2005-10-23 05:55:04 UTC
  • mto: (1185.25.1)
  • mto: This revision was merged to the branch mainline in revision 1488.
  • Revision ID: aaron.bentley@utoronto.ca-20051023055504-118466d505ee4f52
Updated NEWS, error out if --show-base supplied and unsupported

Show diffs side-by-side

added added

removed removed

Lines of Context:
NEWS
54
54
 
55
55
    * Merge now has a retcode of 1 when conflicts occur. (Robert Collins)
56
56
 
 
57
    * --merge-type weave is now supported for file contents.  Tree-shape
 
58
      changes are still three-way based.  (Martin Pool, Aaron Bentley)
 
59
 
57
60
  TESTING:
58
61
 
59
62
    * The 'bzr selftest --pattern' option for has been removed, now