Viewing all changes in revision 3250.1.1.
- Committer: Martin Albisetti
- Date: 2008-03-05 10:26:17 UTC
- mto: (3251.1.1 bzr.dev)
- mto: This revision was merged to the branch mainline in revision 3252.
- Revision ID: argentina@gmail.com-20080305102617-ah2z6vbayk1liu0b
Small tweak to make resolving conflicts a bit clearer
- files modified:
- doc/en/user-guide/resolving_conflicts.txt
expand all
collapse all
added
removed
