← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to NEWS

  • Committer: Robert Collins
  • Date: 2005-11-13 18:57:26 UTC
  • mfrom: (1185.31.9)
  • Revision ID: robertc@robertcollins.net-20051113185726-39ede10d746eee6d
Merge Johns current integration work.

Show diffs side-by-side

added added

removed removed

Lines of Context:
NEWS
73
73
 
74
74
  IMPROVEMENTS:
75
75
  
 
76
    * pull now takes --verbose to show you what revisions are added or removed
 
77
      (John A Meinel)
 
78
 
76
79
    * merge now takes a --show-base option to include the base text in
77
80
      conflicts.
78
81
      (Aaron Bentley)