/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to doc/unrelated-merge.txt

  • Committer: Aaron Bentley
  • Date: 2006-02-21 02:26:30 UTC
  • mto: (1558.1.1 bzr.ab.integration)
  • mto: This revision was merged to the branch mainline in revision 1559.
  • Revision ID: aaron.bentley@utoronto.ca-20060221022630-c74618c305be4ffd
Switched to ConfigObj 4.2.0

Show diffs side-by-side

added added

removed removed

Lines of Context:
 
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. 
 
 
b'\\ No newline at end of file'