On Tue, Dec 04, 2012 at 12:31:28PM -0500, Bruce Momjian wrote: > I have applied the attached patch to 9.0 to fix a merge conflict. I > patterned it after the commits you did to the other branches.
That is interesting. I fixed the same conflict and my git showed the commit, but apparently that upush didn't work correctly. Sorry. Michael -- Michael Meskes Michael at Fam-Meskes dot De, Michael at Meskes dot (De|Com|Net|Org) Michael at BorussiaFan dot De, Meskes at (Debian|Postgresql) dot Org Jabber: michael.meskes at gmail dot com VfL Borussia! Força Barça! Go SF 49ers! Use Debian GNU/Linux, PostgreSQL -- Sent via pgsql-hackers mailing list (pgsql-hackers@postgresql.org) To make changes to your subscription: http://www.postgresql.org/mailpref/pgsql-hackers
