On Fri, Aug 30, 2013 at 00:05:44 -0700,
Luya Tshimbalanga <luya(a)fedoraproject.org> wrote:
Yes, I forgot to merge that for f20. I cannot merge the change from
master due to
I set out a warning at the branch that you shouldn't be "merge"ing f20
and master because they are different and doing so would break things.
You want to use git cherry-pick in the f20 branch using the commit from
master. You can use git log in master to get the id for you commit.
In this case it appears the commit is 4fcffa3b929d2dd13842aef8d1e40d2f701bab15.
So you should do
git cherry-pick 4fcffa3b929d2dd13842aef8d1e40d2f701bab15
and then push the change out.