/pidgin/main: 841168b115f7: Merge release-2.x.y branch into master.
mark at kingant.net
Fri Apr 24 17:54:44 EDT 2015
Author: Mark Doliner <mark at kingant.net>
Date: 2015-04-24 14:54 -0700
Merge release-2.x.y branch into master.
FYI this is the command I used:
hg merge release-2.x.y
It's good to do this frequently when changes are made to the release-2.x.y
branch. If you wait a long time then the merge becomes difficult. There
could be many changes and if there are merge conflicts it's hard to know
which things should be kept.
In this case I think the changes in the release-2.x.y branch already
existed in master, so there are no changes. I believe that running the
merge command makes a note in the revision history that "changes from
release-2.x.y have been merged in master." So the next time someone does
the merge it'll start from this revision.
More information about the Commits