Merge branch 'master' into stable

2026-06-21 01:34:15 +02:00 · 2018-08-14 14:41:59 +03:00
parent ee5810c506 4293603ed1
commit 0b15576db8
1 changed files with 1 additions and 0 deletions
@@ -139,6 +139,7 @@ sub build_pgprobackup
 		'fetch.c',
 		'help.c',
 		'init.c',
+		'merge.c',
 		'parsexlog.c',
 		'pg_probackup.c',
 		'restore.c',