← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to NEWS

  • Committer: Martin Pool
  • Date: 2005-08-30 04:47:42 UTC
  • Revision ID: mbp@sourcefrog.net-20050830044742-0437d5b674f9ccaf
- change conflict markers to suit smerge, etc

Show diffs side-by-side

added added

removed removed

Lines of Context:
NEWS
12
12
 
13
13
    * Much better merge support.
14
14
 
 
15
    * merge3 conflicts are now reported with markers like '<<<<<<<'
 
16
      (seven characters) which is the same as CVS and pleases things
 
17
      like emacs smerge.
 
18
 
15
19
 
16
20
  BUG FIXES:
17
21