/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to doc/developers/miscellaneous-notes.txt

  • Committer: John Arbash Meinel
  • Date: 2009-05-01 18:09:24 UTC
  • mto: This revision was merged to the branch mainline in revision 4322.
  • Revision ID: john@arbash-meinel.com-20090501180924-bco4vmhymopg5lls
Different sides deleting different amounts is now a conflict.

This is because the final 'lines' are different, but something occurred
on each side.

Show diffs side-by-side

added added

removed removed

Lines of Context:
doc/developers/miscellaneous-notes.txt
1
 
Miscellaneous notes
2
 
===================
3
 
 
4
 
.. toctree::
5
 
   :hidden:
6
 
 
7
 
   dirstate
8
 
   update
9
 
 
10
 
 
11
 
* `dirstate <dirstate.html>`_ |--| An observation re. the dirstate file
12
 
 
13
 
* `"bzr update" performance analysis <update.html>`_ |--| "bzr update"
14
 
  performance analysis
15
 
 
16
 
 
17
 
.. |--| unicode:: U+2014
18
 
 
19
 
..
20
 
   vim: ft=rst tw=74 ai