Fix issue #114 'Consider re-adding pre-merge-tracking
examples'.
* en/book/ch04-branching-and-merging.xml (svn.branchemerge.basicmerging.stayinsync): Add a new sidebar 'Keeping a Branch in Sync Without Merge Tracking'.
Authored by: ptburba@gmail.com 2011-11-09
Parent: [r4184]
Child: [r4186]
