To get this branch, use:
bzr branch
http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar
Viewing all changes in revision 4597.3.1.
- Committer: Vincent Ladeuil
- Date: 2009-08-13 06:21:35 UTC
- mto: (4597.3.66 dont-add-conflict-helpers) (5008.1.1 integration)
- mto: This revision was merged to the branch mainline in revision 5009.
- Revision ID: v.ladeuil+lp@free.fr-20090813062135-mvkhie71vei48lco
First draft describing the different conflicts and some ways to resolve them.
- files added:
- Outline.txt
expand all
collapse all
added
removed
