diff ChangeLog @ 112273:d074b0e8afef

* admin/notes/bzr: Add an idiot's guide to merging between branches.
author Glenn Morris <rgm@gnu.org>
date Sat, 15 Jan 2011 13:47:46 -0800
parents 105ba04b561c
children 87a2c7d05f19
line wrap: on
line diff