← 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-19 02:40:58 UTC
  • mto: (1185.19.1)
  • mto: This revision was merged to the branch mainline in revision 1474.
  • Revision ID: aaron.bentley@utoronto.ca-20051019024058-4562b385778ee490
Added --show-base to merge

Show diffs side-by-side

added added

removed removed

Lines of Context:
NEWS
1
1
UNRELEASED CHANGES
2
2
 
3
3
  IMPROVEMENTS:
 
4
    * merge now takes a --show-base option to include the base text in
 
5
      conflicts.
 
6
      (Aaron Bentley)
 
7
 
4
8
    * The config files are now read using ConfigObj, so '=' should be used as
5
9
      a separator, not ':'.
 
10
      (Aaron Bentley)
6
11
 
7
12
    * The config directory is now ~/.bazaar, and there is a single file 
8
13
      ~/.bazaar/bazaar.conf storing email, editor and other preferences.