← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to doc/unrelated-merge.txt

  • Committer: Tarmac
  • Author(s): Florent Gallaire
  • Date: 2017-03-17 12:23:47 UTC
  • mfrom: (6621.1.1 fix-gmtime-lite)
  • Revision ID: tarmac-20170317122347-2nnf3cicpgrhux3h
Fix for Windows and 32-bit platforms buggy gmtime(). [r=vila,richard-wilbur]

Show diffs side-by-side

added added

removed removed

Lines of Context:
doc/unrelated-merge.txt
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'