Resolve few Copyright conflicts in pg_dump

reshke · reshke · commit 86c7a3df5ad8 · 2025-12-25T11:46:52.000Z
diff --git a/src/bin/pg_dump/pg_dump.c b/src/bin/pg_dump/pg_dump.c
@@ -4,13 +4,9 @@
  *	  pg_dump is a utility for dumping out a postgres database
  *	  into a script file.
  *
-<<<<<<< HEAD
  * Portions Copyright (c) 2005-2010, Greenplum inc
  * Portions Copyright (c) 2012-Present VMware, Inc. or its affiliates.
- * Portions Copyright (c) 1996-2021, PostgreSQL Global Development Group
-=======
  * Portions Copyright (c) 1996-2023, PostgreSQL Global Development Group
->>>>>>> REL_16_9
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  *	pg_dump will read the system catalogs in a database and dump out a
diff --git a/src/bin/pg_dump/pg_dump.h b/src/bin/pg_dump/pg_dump.h
@@ -3,13 +3,9 @@
  * pg_dump.h
  *	  Common header file for the pg_dump utility
  *
-<<<<<<< HEAD
  * Portions Copyright (c) 2005-2010, Greenplum inc
  * Portions Copyright (c) 2012-Present VMware, Inc. or its affiliates.
- * Portions Copyright (c) 1996-2021, PostgreSQL Global Development Group
-=======
  * Portions Copyright (c) 1996-2023, PostgreSQL Global Development Group
->>>>>>> REL_16_9
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * src/bin/pg_dump/pg_dump.h
diff --git a/src/bin/pg_dump/pg_dumpall.c b/src/bin/pg_dump/pg_dumpall.c
@@ -2,13 +2,9 @@
  *
  * pg_dumpall.c
  *
-<<<<<<< HEAD
  * Portions Copyright (c) 2006-2010, Greenplum inc.
  * Portions Copyright (c) 2012-Present VMware, Inc. or its affiliates.
- * Portions Copyright (c) 1996-2021, PostgreSQL Global Development Group
-=======
  * Portions Copyright (c) 1996-2023, PostgreSQL Global Development Group
->>>>>>> REL_16_9
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * pg_dumpall forces all pg_dump output to be text, since it also outputs

Original file line number	Diff line number	Diff line change
`@@ -4,13 +4,9 @@`
`4`	`4`	`* pg_dump is a utility for dumping out a postgres database`
`5`	`5`	`* into a script file.`
`6`	`6`	`*`
`7`		`-<<<<<<< HEAD`
`8`	`7`	`* Portions Copyright (c) 2005-2010, Greenplum inc`
`9`	`8`	`* Portions Copyright (c) 2012-Present VMware, Inc. or its affiliates.`
`10`		`- * Portions Copyright (c) 1996-2021, PostgreSQL Global Development Group`
`11`		`-=======`
`12`	`9`	`* Portions Copyright (c) 1996-2023, PostgreSQL Global Development Group`
`13`		`->>>>>>> REL_16_9`
`14`	`10`	`* Portions Copyright (c) 1994, Regents of the University of California`
`15`	`11`	`*`
`16`	`12`	`* pg_dump will read the system catalogs in a database and dump out a`
Original file line number	Diff line number	Diff line change
`@@ -3,13 +3,9 @@`
`3`	`3`	`* pg_dump.h`
`4`	`4`	`* Common header file for the pg_dump utility`
`5`	`5`	`*`
`6`		`-<<<<<<< HEAD`
`7`	`6`	`* Portions Copyright (c) 2005-2010, Greenplum inc`
`8`	`7`	`* Portions Copyright (c) 2012-Present VMware, Inc. or its affiliates.`
`9`		`- * Portions Copyright (c) 1996-2021, PostgreSQL Global Development Group`
`10`		`-=======`
`11`	`8`	`* Portions Copyright (c) 1996-2023, PostgreSQL Global Development Group`
`12`		`->>>>>>> REL_16_9`
`13`	`9`	`* Portions Copyright (c) 1994, Regents of the University of California`
`14`	`10`	`*`
`15`	`11`	`* src/bin/pg_dump/pg_dump.h`
Original file line number	Diff line number	Diff line change
`@@ -2,13 +2,9 @@`
`2`	`2`	`*`
`3`	`3`	`* pg_dumpall.c`
`4`	`4`	`*`
`5`		`-<<<<<<< HEAD`
`6`	`5`	`* Portions Copyright (c) 2006-2010, Greenplum inc.`
`7`	`6`	`* Portions Copyright (c) 2012-Present VMware, Inc. or its affiliates.`
`8`		`- * Portions Copyright (c) 1996-2021, PostgreSQL Global Development Group`
`9`		`-=======`
`10`	`7`	`* Portions Copyright (c) 1996-2023, PostgreSQL Global Development Group`
`11`		`->>>>>>> REL_16_9`
`12`	`8`	`* Portions Copyright (c) 1994, Regents of the University of California`
`13`	`9`	`*`
`14`	`10`	`* pg_dumpall forces all pg_dump output to be text, since it also outputs`