Message191064
Merging itself is trivial. The trick is how preserve the history of both files. Unfortunately this can't be represented in one mercurial patch. Three commits needed for this. |
|
Date |
User |
Action |
Args |
2013-06-13 07:16:02 | serhiy.storchaka | set | recipients:
+ serhiy.storchaka, lemburg, loewis, nnorwitz, ezio.melotti, python-dev, Matthew.Bentley |
2013-06-13 07:16:02 | serhiy.storchaka | set | messageid: <1371107762.02.0.543709061374.issue18048@psf.upfronthosting.co.za> |
2013-06-13 07:16:01 | serhiy.storchaka | link | issue18048 messages |
2013-06-13 07:16:01 | serhiy.storchaka | create | |
|