~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to NEWS

  • Committer: John Arbash Meinel
  • Date: 2005-10-27 02:41:10 UTC
  • mto: (1185.31.5)
  • mto: This revision was merged to the branch mainline in revision 1506.
  • Revision ID: john@arbash-meinel.com-20051027024110-609396a0bd1a5b3b
Added NEWS entry.

Show diffs side-by-side

added added

removed removed

Lines of Context:
2
2
 
3
3
  IMPROVEMENTS:
4
4
  
 
5
    * pull now takes --verbose to show you what revisions are added or removed
 
6
      (John A Meinel)
 
7
 
5
8
    * merge now takes a --show-base option to include the base text in
6
9
      conflicts.
7
10
      (Aaron Bentley)