← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to NEWS

  • Committer: Matthäus G. Chajdas
  • Date: 2010-07-19 18:16:56 UTC
  • mto: (5383.1.1 integration)
  • mto: This revision was merged to the branch mainline in revision 5384.
  • Revision ID: dev@anteru.net-20100719181656-snkiywdjtpfgtdgh
Allow both --using and --diff-options.

Added an example to the diff documentation to showcase how to use --using and --diff-options. Change the test to use /usr/bin/diff. Update news entry.

Show diffs side-by-side

added added

removed removed

Lines of Context:
NEWS
20
20
Bug Fixes
21
21
*********
22
22
 
 
23
* Allow using both --using and --diff-options. (Matthäus G. Chajdas, #234708)
 
24
 
23
25
Improvements
24
26
************
25
27
 
58
60
* Don't traceback trying to unversion children files of an already
59
61
  unversioned directory.  (Vincent Ladeuil, #494221)
60
62
 
61
 
* Check if both --diff-options and --using are set, and exit with error
62
 
  in this case. (Matthäus G. Chajdas, #234708)
63
 
 
64
63
Improvements
65
64
************
66
65