~bzr-pqm/bzr/bzr.dev

1185.1.29 by Robert Collins
merge merge tweaks from aaron, which includes latest .dev
1
****************************
2
Merging unrelated changesets
3
****************************
4
5
It ought to be possible to merge in even totally unrelated changesets,
6
by just treating them as patches.  It is possible that the file ids
7
will mismatch, in which case we could perhaps assume the filenames are
8
compatible.