=== Applying patches on top of PostgreSQL commit ID 8a27d418f8fc08b62f371c1b167efbfbf0a2a24e ===
/etc/rc.d/jail: WARNING: Per-jail configuration via jail_* variables  is obsolete.  Please consider migrating to /etc/jail.conf.
Fri Oct 31 16:37:24 UTC 2025
On branch cf/6194
nothing to commit, working tree clean
=== using 'git am' to apply patch ./0001-libpq-Simplify-newline-handling-in-t-006_service.patch ===
Applying: libpq: Simplify newline handling in t/006_service
Using index info to reconstruct a base tree...
M	src/interfaces/libpq/t/006_service.pl
Falling back to patching base and 3-way merge...
Auto-merging src/interfaces/libpq/t/006_service.pl
CONFLICT (content): Merge conflict in src/interfaces/libpq/t/006_service.pl
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 libpq: Simplify newline handling in t/006_service
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".
Unstaged changes after reset:
M	src/interfaces/libpq/t/006_service.pl
=== using patch(1) to apply patch ./0001-libpq-Simplify-newline-handling-in-t-006_service.patch ===
patching file src/interfaces/libpq/t/006_service.pl
Hunk #1 FAILED at 22.
Hunk #2 FAILED at 51.
2 out of 2 hunks FAILED -- saving rejects to file src/interfaces/libpq/t/006_service.pl.rej
Removing src/interfaces/libpq/t/006_service.pl.rej
=== using 'git apply' to apply patch ./0001-libpq-Simplify-newline-handling-in-t-006_service.patch ===
Applied patch to 'src/interfaces/libpq/t/006_service.pl' with conflicts.
U src/interfaces/libpq/t/006_service.pl
diff --cc src/interfaces/libpq/t/006_service.pl
index 29a70629b44,432a7290c65..00000000000
--- a/src/interfaces/libpq/t/006_service.pl
+++ b/src/interfaces/libpq/t/006_service.pl
@@@ -53,8 -53,7 +53,12 @@@ append_to_file($srvfile_nested, "servic
  my $srvfile_nested_2 = "$td/pg_service_nested_2.conf";
  copy($srvfile_valid, $srvfile_nested_2)
    or die "Could not copy $srvfile_valid to $srvfile_nested_2: $!";
++<<<<<<< ours
 +append_to_file($srvfile_nested_2,
 +	'servicefile=' . $srvfile_default . "\n");
++=======
+ append_to_file($srvfile_nested_2, "servicefile=$srvfile_default\n");
++>>>>>>> theirs
  
  # Set the fallback directory lookup of the service file to the temporary
  # directory of this test.  PGSYSCONFDIR is used if the service file