merge-one-file: fix broken merges with alternate work trees

diff --git a/builtin-var.c b/builtin-var.c
index e6ee7bc0b643d242d3f8962e29cdadcbe8cf4c54..70fdb4dec7e8b0c56ded90ee7f086cc9f16293a1 100644 (file)
--- a/builtin-var.c
+++ b/builtin-var.c
@@ -20,7 +20,7 @@ static const char *editor(int flag)
 
 static const char *pager(int flag)
 {
-       const char *pgm = git_pager();
+       const char *pgm = git_pager(1);
 
        if (!pgm)
                pgm = "cat";