=== Applying patches on top of PostgreSQL commit ID 53a49365052026907afff7613929710d1e7f0da0 ===
/etc/rc.d/jail: WARNING: Per-jail configuration via jail_* variables  is obsolete.  Please consider migrating to /etc/jail.conf.
Fri Jan 31 21:16:28 UTC 2025
On branch cf/3772
nothing to commit, working tree clean
=== applying patch ./v6-0001-MinGW-has-GetLocaleInfoEx.patch
Applied patch to 'src/port/chklocale.c' with conflicts.
U src/port/chklocale.c
diff --cc src/port/chklocale.c
index 034939f7fd,a15b0d5349..0000000000
--- a/src/port/chklocale.c
+++ b/src/port/chklocale.c
@@@ -203,6 -203,7 +203,10 @@@ win32_get_codeset(const char *ctype
  {
  	char	   *r = NULL;
  	char	   *codepage;
++<<<<<<< ours
++=======
+ 
++>>>>>>> theirs
  	uint32		cp;
  	WCHAR		wctype[LOCALE_NAME_MAX_LENGTH];